From 525960bb75ae1d026a3fd914a772d6eb4ae45fca Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Mon, 1 May 2023 20:03:46 -0700 Subject: [PATCH] flake: fix usage of prev in overlays --- flake.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index bb44649..bcdcbf3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,11 @@ "aarch64-linux" "x86_64-linux" ]; - pkgsFor = nixpkgs.legacyPackages; + pkgsFor = genSystems (system: + import nixpkgs { + inherit system; + overlays = [self.overlays.default]; + }); mkDate = longDate: (lib.concatStringsSep "-" [ (builtins.substring 0 4 longDate) (builtins.substring 4 2 longDate) @@ -21,12 +25,12 @@ ]); version = "0.1" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); in { - overlays.default = _: prev: { - hyprland-protocols = prev.callPackage ./nix/default.nix {inherit version;}; + overlays.default = final: prev: { + hyprland-protocols = final.callPackage ./nix/default.nix {inherit version;}; }; packages = genSystems (system: - (self.overlays.default null pkgsFor.${system}) + (self.overlays.default pkgsFor.${system} pkgsFor.${system}) // {default = self.packages.${system}.hyprland-protocols;}); formatter = genSystems (system: pkgsFor.${system}.alejandra);