diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-02-01 00:00:00 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-26 22:42:33 +0000 |
commit | f1074211ce4c2f59f3c6e24dc5d54ee69478a502 (patch) | |
tree | b34a04ec03950a245667e64624191f168beb7013 | |
parent | 0ab1067d120e15a0fa8594f63441cb720f08f0c3 (diff) | |
download | nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar.gz nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar.bz2 nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar.lz nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar.xz nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.tar.zst nixlib-f1074211ce4c2f59f3c6e24dc5d54ee69478a502.zip |
cc-wrapper: allow building without documentation, propagate info pages
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8de2366ff5f5..ba8aca87c72b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-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 ? "" , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null @@ -14,7 +15,7 @@ with stdenvNoCC.lib; -assert nativeTools -> nativePrefix != ""; +assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> cc != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); @@ -84,7 +85,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; passthru = { # "cc" is the generic name for a C compiler, but there is no one for package @@ -115,7 +116,7 @@ stdenv.mkDerivation { '' set -u - mkdir -p $out/bin $out/nix-support $man/nix-support + mkdir -p $out/bin $out/nix-support wrap() { local dst="$1" @@ -246,7 +247,6 @@ stdenv.mkDerivation { '' + optionalString (!nativeTools) '' - ## ## Initial CFLAGS ## @@ -276,19 +276,19 @@ stdenv.mkDerivation { echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags + '' + + optionalString propagateDoc '' ## - ## User env support + ## Man page and info support ## - # Propagate the wrapped cc so that if you install the wrapper, - # you get tools like gcov, the manpages, etc. as well (including - # for binutils and Glibc). + mkdir -p $man/nix-support $info/nix-support printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages + printWords ${cc.info or ""} > $info/nix-support/propagated-user-env-packages '' + '' - ## ## Hardening support ## @@ -308,8 +308,8 @@ stdenv.mkDerivation { ## ## Extra custom steps ## - '' + + extraBuildCommands; inherit expand-response-params; |