diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-02-26 18:06:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 18:06:11 -0500 |
commit | 4a29081a941bdd30ad7882805e8124aa59d87e81 (patch) | |
tree | b9601367f3b641fe99cfae3324139b7b4b048b1f /pkgs/build-support/bintools-wrapper/default.nix | |
parent | b4cf3f79092475a332136eab55d48ce613b3e043 (diff) | |
parent | d45e39c9a9961544933bfd5b3b59ea47b1c7efb3 (diff) | |
download | nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar.gz nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar.bz2 nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar.lz nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar.xz nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.tar.zst nixlib-4a29081a941bdd30ad7882805e8124aa59d87e81.zip |
Merge pull request #35071 from oxij/stdenv/infopages
stdenv, bash: fixing info pages and stuff
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48fd8665cb47..e88482397f2f 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -5,7 +5,8 @@ # script that sets up the right environment variables so that the # compiler and the linker just "work". -{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +{ name ? "" +, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , bintools ? null, libc ? null , coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null , extraPackages ? [], extraBuildCommands ? "" @@ -15,7 +16,7 @@ with stdenvNoCC.lib; -assert nativeTools -> nativePrefix != ""; +assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> bintools != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); @@ -83,7 +84,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; passthru = { inherit bintools libc nativeTools nativeLibc nativePrefix; @@ -111,7 +112,7 @@ stdenv.mkDerivation { '' set -u - mkdir -p $out/bin {$out,$info,$man}/nix-support + mkdir -p $out/bin $out/nix-support wrap() { local dst="$1" @@ -237,28 +238,27 @@ stdenv.mkDerivation { '') + optionalString (!nativeTools) '' - ## ## User env support ## # Propagate the underling unwrapped bintools so that if you - # install the wrapper, you get tools like objdump, the manpages, - # etc. as well (same for any binaries of libc). + # install the wrapper, you get tools like objdump (same for any + # binaries of libc). printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + '' + + optionalString propagateDoc '' ## ## Man page and info support ## - printWords ${bintools.info or ""} \ - >> $info/nix-support/propagated-build-inputs - printWords ${bintools.man or ""} \ - >> $man/nix-support/propagated-build-inputs + mkdir -p $man/nix-support $info/nix-support + printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs + printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs '' + '' - ## ## Hardening support ## @@ -286,8 +286,8 @@ stdenv.mkDerivation { ## ## Extra custom steps ## - '' + + extraBuildCommands; inherit dynamicLinker expand-response-params; |