Nix Flake: Fix overlay (again) (#3196)

master
Jacob Birkett 2024-05-02 23:31:39 -07:00 committed by GitHub
parent 0b6476da32
commit 50476edc98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 14 deletions

View File

@ -46,8 +46,11 @@
}; };
}); });
overlays.default = final: prev: { overlays = {
default = self.overlays.waybar;
waybar = final: prev: {
waybar = final.callPackage ./nix/default.nix { waybar = final.callPackage ./nix/default.nix {
waybar = prev.waybar;
# take the first "version: '...'" from meson.build # take the first "version: '...'" from meson.build
version = version =
(builtins.head (builtins.split "'" (builtins.head (builtins.split "'"
@ -57,11 +60,11 @@
+ "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
}; };
}; };
};
packages = genSystems (pkgs: packages = genSystems (pkgs: {
let packages = self.overlays.default pkgs pkgs; default = self.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
in packages // { inherit (pkgs) waybar;
default = packages.waybar;
}); });
}; };
} }