use global buildInputs for environments

tek · Jul 29, 2023 · c43eb10 · c43eb10
1 parent b38938e
commit c43eb10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/modules/env.nix b/modules/env.nix
@@ -37,10 +37,10 @@ let
   fi
   '';
 
-  customBuildInputs =
-    if isFunction config.buildInputs
-    then config.buildInputs config.ghc.pkgs
-    else config.buildInputs;
+  mkBuildInputs = def:
+    if isFunction def
+    then def config.ghc.pkgs
+    else def;
 
   extraHs = ghc:
   if isFunction config.haskellPackages
@@ -57,7 +57,8 @@ let
 
   buildInputs = let
   in
-  customBuildInputs ++
+  mkBuildInputs config.buildInputs ++
+  mkBuildInputs global.buildInputs ++
   optional config.hls.enable config.hls.package ++
   optional config.ghcid.enable config.ghcid.package ++
   [ghcWithPackages]

diff --git a/modules/overrides.nix b/modules/overrides.nix
@@ -22,7 +22,7 @@ with lib;
     };
 
     buildInputs = mkOption {
-      description = mdDoc "Additional non-Haskell dependencies required by all packages.";
+      description = mdDoc "Additional non-Haskell dependencies provided to all packages and environments.";
       type = either (functionTo (listOf package)) (listOf package);
       default = [];
     };