Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"

This reverts commit 02c09e0171.
This commit is contained in:
Eelco Dolstra 2018-08-09 12:57:38 +02:00
parent fe68c9d450
commit c981787db9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 12 additions and 11 deletions

View file

@ -6,10 +6,9 @@
# compiler and the linker just "work".
{ name ? ""
, stdenvNoCC
, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, propagateDoc ? !nativeTools && bintools != null && bintools ? man
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, bintools ? null, libc ? null
, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
, extraPackages ? [], extraBuildCommands ? ""
, buildPackages ? {}
, useMacosReexportHack ? false
@ -268,8 +267,9 @@ stdenv.mkDerivation {
## Man page and info support
##
ln -s ${bintools.man} $man
ln -s ${bintools.info} $info
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
''
+ ''

View file

@ -6,10 +6,8 @@
# compiler and the linker just "work".
{ name ? ""
, stdenvNoCC
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, propagateDoc ? !nativeTools && cc != null && cc ? man
, extraPackages ? [], extraBuildCommands ? ""
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, buildPackages ? {}
@ -263,8 +261,9 @@ stdenv.mkDerivation {
## Man page and info support
##
ln -s ${cc.man} $man
ln -s ${cc.info} $info
mkdir -p $man/nix-support $info/nix-support
printWords ${cc.man or ""} >> $man/nix-support/propagated-build-inputs
printWords ${cc.info or ""} >> $info/nix-support/propagated-build-inputs
''
+ ''

View file

@ -88,6 +88,7 @@ in rec {
extraPackages = lib.optional (libcxx != null) libcxx;
nativeTools = false;
propagateDoc = false;
nativeLibc = false;
inherit buildPackages coreutils gnugrep bintools;
libc = last.pkgs.darwin.Libsystem;

View file

@ -90,6 +90,7 @@ let
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
name = "${name}-gcc-wrapper";
nativeTools = false;
propagateDoc = false;
nativeLibc = false;
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
inherit (prevStage) stdenv;