diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-25 14:22:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-25 16:12:58 +0200 |
| commit | 70d4d22806a2dee5d5c50048742b57ec9dfab433 (patch) | |
| tree | afa72ccfc25cab41fcb66f8db84741365b3bb95e | |
| parent | b9c403c5310a61d7274f8490b9a06be8ccd1bc93 (diff) | |
| download | nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar.gz nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar.bz2 nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar.lz nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar.xz nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.tar.zst nixpkgs-70d4d22806a2dee5d5c50048742b57ec9dfab433.zip | |
cc-wrapper: Add a "man" output
... and propagate cc.man from there.
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 570bb6785df..7df9615653f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation { inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; + outputs = [ "out" "man" ]; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile @@ -166,7 +167,7 @@ stdenv.mkDerivation { buildCommand = '' - mkdir -p $out/bin $out/nix-support + mkdir -p $out/bin $out/nix-support $man/nix-support wrap() { local dst="$1" @@ -277,7 +278,8 @@ stdenv.mkDerivation { # 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). - echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + echo ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + echo ${cc.man or ""} > $man/nix-support/propagated-user-env-packages echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' |