diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-25 15:51:37 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-25 15:53:28 -0600 |
| commit | 7eeb02d47b388ac4f66f4b77cddffa409042a8d8 (patch) | |
| tree | 7fa33bd4b5495f6d3fe06e65e4e50602bbee3085 /pkgs/stdenv/generic/make-derivation.nix | |
| parent | b49ed49c68e5950c9f77e000ddeb68dd665e5563 (diff) | |
| download | nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar.gz nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar.bz2 nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar.lz nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar.xz nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.tar.zst nixlib-7eeb02d47b388ac4f66f4b77cddffa409042a8d8.zip | |
Revert "make-derivation: add disallowedReferences in strictDeps"
This reverts commit 8dbfb61e4617050917ce6bb7c5f4efc902c2a36c. Also reverts commit fc99c337edd29d9596379667063bc3a8f3cea5b3. Fixes #50915
Diffstat (limited to 'pkgs/stdenv/generic/make-derivation.nix')
| -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 60d6f1bd92cf..6c0c94487dee 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -228,22 +228,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] |