diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 20:15:47 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 20:15:47 +0100 |
| commit | ba463e70e3d8c86d16b38ddddfe4f30aeede26b4 (patch) | |
| tree | 9c6739ca5912901e49ccb06806321409a00ebffd /pkgs/stdenv/generic | |
| parent | 0ab7b23637df66aec41bf34fd261f43d2e95309d (diff) | |
| download | nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar.gz nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar.bz2 nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar.lz nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar.xz nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.tar.zst nixlib-ba463e70e3d8c86d16b38ddddfe4f30aeede26b4.zip | |
make-derivation.nix: Float out unsafeDerivationToUntrackedOutpath
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b469904c6a33..c40eaee5e4d6 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -133,6 +133,13 @@ let "sandboxProfile" "propagatedSandboxProfile" ]; + # Turn a derivation into its outPath without a string context attached. + # See the comment at the usage site. + unsafeDerivationToUntrackedOutpath = drv: + if isDerivation drv + then builtins.unsafeDiscardStringContext drv.outPath + else drv; + makeDerivationArgument = @@ -242,13 +249,6 @@ let separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; outputs' = outputs ++ optional separateDebugInfo' "debug"; - # Turn a derivation into its outPath without a string context attached. - # See the comment at the usage site. - unsafeDerivationToUntrackedOutpath = drv: - if isDerivation drv - then builtins.unsafeDiscardStringContext drv.outPath - else drv; - noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs |