summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-01 09:42:54 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-01 09:42:54 +0200
commit55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch)
treeadbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/stdenv
parentf498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff)
parentff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff)
downloadnixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.gz
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.bz2
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.lz
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.xz
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.zst
nixpkgs-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/adapters.nix13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 8ece43f87b0..8f62bd24dda 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -62,8 +62,21 @@ rec {
         ];
         mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
       });
+      static = true;
     };
 
+
+  /* Modify a stdenv so that all buildInputs are implicitly propagated to
+     consuming derivations
+  */
+  propagateBuildInputs = stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // {
+        propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ (args.buildInputs or []);
+        buildInputs = [];
+      });
+    };
+
+
   /* Modify a stdenv so that the specified attributes are added to
      every derivation returned by its mkDerivation function.