File tree Expand file tree Collapse file tree 1 file changed +12
-7
lines changed Expand file tree Collapse file tree 1 file changed +12
-7
lines changed Original file line number Diff line number Diff line change 11{ system ? builtins . currentSystem
22, crossSystem ? null
33, config ? { }
4+ , deploymentGlobalsFn ? ## :: Pkgs -> GlobalsOverlayOverDefaults
5+ pkgs :
6+ if builtins . pathExists ../globals.nix
7+ then import ../globals.nix pkgs
8+ else builtins . trace "globals.nix missing, please add symlink" { }
49} :
510let
611 defaultSourcePaths = import ./sources.nix { inherit pkgs ; } ;
9095 ( import ./packages.nix )
9196 ] ;
9297
93- globals =
94- if builtins . pathExists ../globals.nix
95- then [ ( pkgs : _ : with pkgs . lib ; let
98+ buildGlobals =
99+ specificGlobalsFn :
100+
101+ [ ( pkgs : _ : with pkgs . lib ; let
96102 globalsDefault = import ../globals-defaults.nix pkgs ;
97- globalsSpecific = import ../globals.nix pkgs ;
103+ globalsSpecific = specificGlobalsFn pkgs ;
98104 in {
99105 globals = globalsDefault // ( recursiveUpdate {
100106 inherit ( globalsDefault ) ec2 libvirtd environmentVariables ;
101107 } globalsSpecific ) ;
102- } ) ]
103- else builtins . trace "globals.nix missing, please add symlink" [ ( pkgs : _ : {
104- globals = import ../globals-defaults.nix pkgs ;
105108 } ) ] ;
106109
110+ globals = buildGlobals deploymentGlobalsFn ;
111+
107112 # merge upstream sources with our own:
108113 upstream-overlay = self : super : {
109114 inherit iohkNix ;
You can’t perform that action at this time.
0 commit comments