diff options
author | Artturin <Artturin@artturin.com> | 2022-12-07 00:08:33 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-12-08 06:13:19 +0200 |
commit | 734d7df2351ac1a10774e665447c5cdc286fc16e (patch) | |
tree | 70f7127d1981a11da2298cdbb47e97574e1ad040 /pkgs/build-support/bintools-wrapper/default.nix | |
parent | 8ad0103a349b827b48bfaa908dbf5cd7a9371076 (diff) |
allow derivation attributes in env
derivations can be coerced to their output paths
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index ea925e90fa479..d41eaabe51a15 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -103,15 +103,12 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin; - shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; - - inherit targetPrefix suffixSalt; + inherit bintools_bin libc_bin libc_dev libc_lib; outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { + inherit targetPrefix suffixSalt; inherit bintools libc nativeTools nativeLibc nativePrefix; emacsBufferSetup = pkgs: '' @@ -366,10 +363,13 @@ stdenv.mkDerivation { ## + extraBuildCommands; - inherit dynamicLinker; - - # for substitution in utils.bash - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + env = { + # for substitution in utils.bash + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + inherit dynamicLinker suffixSalt coreutils_bin; + }; meta = let bintools_ = if bintools != null then bintools else {}; in |