flake.nix: use lib.extend

This preserves the nixosSystem function if another flake uses lib.extend itself.
NixOS · Jul 23, 2020 · 74430a8 · 74430a8
1 parent 2d6ab6e
commit 74430a8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -18,17 +18,17 @@
 
     in
     {
-      lib = lib // {
+      lib = lib.extend (final: prev: {
         nixosSystem = { modules, ... } @ args:
           import ./nixos/lib/eval-config.nix (args // {
             modules = modules ++
               [ { system.nixos.versionSuffix =
-                    ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
-                  system.nixos.revision = lib.mkIf (self ? rev) self.rev;
+                    ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
+                  system.nixos.revision = final.mkIf (self ? rev) self.rev;
                 }
               ];
           });
-      };
+      });
 
       checks.x86_64-linux.tarball = jobs.tarball;