diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-25 11:38:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:15:55 +0100 |
| commit | efcad4c910a271e846f1d274fe297a83ba97b3cc (patch) | |
| tree | 2633a22674c436cf94761ba7e674cdf27015bddc /pkgs/build-support | |
| parent | 55d129609ddbf667e7a93a9fd0638336a348a647 (diff) | |
| download | nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar.gz nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar.bz2 nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar.lz nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar.xz nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.tar.zst nixpkgs-efcad4c910a271e846f1d274fe297a83ba97b3cc.zip | |
gcc5: split $doc into $man and $info
... because cc-wrapper is meant to propagate man pages into user envs, and info pages are rather large. Also replace the duplicate g++ and gcc man1 pages by a symlink.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8bb215947b0..0c7bf5b667f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -140,7 +140,7 @@ 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} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages + echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' |