diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 09:18:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 09:18:35 +0100 |
| commit | 9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37 (patch) | |
| tree | bee2f6299dadbd3d919059a461eedc67ab0a4e33 /pkgs/stdenv | |
| parent | 5987c5c694f3910e308beda967192cccf9a63610 (diff) | |
| parent | 9db2421d1f65beb38911e8133349193db0042a1d (diff) | |
| download | nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.gz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.bz2 nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.lz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.xz nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.tar.zst nixlib-9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 57e757080a2d..1829531e8959 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -239,22 +239,6 @@ rec { inherit doCheck doInstallCheck; inherit outputs; - } // lib.optionalAttrs strictDeps { - # Make sure "build" dependencies don’t leak into outputs. We - # want to disallow references to depsBuildBuild, - # nativeBuildInputs, and depsBuildTarget. But depsHostHost, - # buildInputs, and depsTargetTarget is okay, so we subtract - # those from disallowedReferences in case a dependency is - # listed in multiple dependency lists. We also include - # propagated dependencies here as well. - disallowedReferences = (attrs.disallowedReferences or []) - ++ (lib.subtractLists - (lib.concatLists ((lib.elemAt propagatedDependencies 0) ++ - (lib.elemAt propagatedDependencies 1) ++ - (lib.elemAt dependencies 1) ++ - (lib.elemAt propagatedDependencies 2) ++ - (lib.elemAt dependencies 2) ) ) - (lib.concatLists ((lib.elemAt dependencies 0)) ) ); } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { cmakeFlags = (/**/ if lib.isString cmakeFlags then [cmakeFlags] |