nix/default.nix: make globals into a parameter

input-output-hk · Jul 28, 2021 · 08f5f6b · 08f5f6b
1 parent a0bdd0c
commit 08f5f6b
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -1,6 +1,11 @@
 { system ? builtins.currentSystem
 , crossSystem ? null
 , config ? {}
+, deploymentGlobalsFn ? ## :: Pkgs -> GlobalsOverlayOverDefaults
+    pkgs:
+    if builtins.pathExists ../globals.nix
+    then import ../globals.nix pkgs
+    else builtins.trace "globals.nix missing, please add symlink" {}
 }:
 let
   defaultSourcePaths = import ./sources.nix { inherit pkgs; };
@@ -90,20 +95,20 @@ let
     (import ./packages.nix)
   ];
 
-  globals =
-    if builtins.pathExists ../globals.nix
-    then [(pkgs: _: with pkgs.lib; let
+  buildGlobals =
+    specificGlobalsFn:
+
+    [(pkgs: _: with pkgs.lib; let
       globalsDefault = import ../globals-defaults.nix pkgs;
-      globalsSpecific = import ../globals.nix pkgs;
+      globalsSpecific = specificGlobalsFn pkgs;
     in {
       globals = globalsDefault // (recursiveUpdate {
         inherit (globalsDefault) ec2 libvirtd environmentVariables;
       } globalsSpecific);
-    })]
-    else builtins.trace "globals.nix missing, please add symlink" [(pkgs: _: {
-      globals = import ../globals-defaults.nix pkgs;
     })];
 
+  globals = buildGlobals deploymentGlobalsFn;
+
   # merge upstream sources with our own:
   upstream-overlay = self: super: {
       inherit iohkNix;
@@ -126,8 +131,8 @@ let
       varnish-overlay
     ];
 
-    pkgs = import nixpkgs {
-      inherit system crossSystem config overlays;
-    };
+  pkgs = import nixpkgs {
+    inherit system crossSystem config overlays;
+  };
 in
   pkgs