Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"
This reverts commit 02c09e0171
.
This commit is contained in:
parent
fe68c9d450
commit
c981787db9
|
@ -6,10 +6,9 @@
|
||||||
# compiler and the linker just "work".
|
# compiler and the linker just "work".
|
||||||
|
|
||||||
{ name ? ""
|
{ name ? ""
|
||||||
, stdenvNoCC
|
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
||||||
, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
|
, bintools ? null, libc ? null
|
||||||
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
|
||||||
, propagateDoc ? !nativeTools && bintools != null && bintools ? man
|
|
||||||
, extraPackages ? [], extraBuildCommands ? ""
|
, extraPackages ? [], extraBuildCommands ? ""
|
||||||
, buildPackages ? {}
|
, buildPackages ? {}
|
||||||
, useMacosReexportHack ? false
|
, useMacosReexportHack ? false
|
||||||
|
@ -268,8 +267,9 @@ stdenv.mkDerivation {
|
||||||
## Man page and info support
|
## Man page and info support
|
||||||
##
|
##
|
||||||
|
|
||||||
ln -s ${bintools.man} $man
|
mkdir -p $man/nix-support $info/nix-support
|
||||||
ln -s ${bintools.info} $info
|
printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs
|
||||||
|
printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs
|
||||||
''
|
''
|
||||||
|
|
||||||
+ ''
|
+ ''
|
||||||
|
|
|
@ -6,10 +6,8 @@
|
||||||
# compiler and the linker just "work".
|
# compiler and the linker just "work".
|
||||||
|
|
||||||
{ name ? ""
|
{ name ? ""
|
||||||
, stdenvNoCC
|
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
||||||
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
|
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
|
||||||
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
|
||||||
, propagateDoc ? !nativeTools && cc != null && cc ? man
|
|
||||||
, extraPackages ? [], extraBuildCommands ? ""
|
, extraPackages ? [], extraBuildCommands ? ""
|
||||||
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
|
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
|
||||||
, buildPackages ? {}
|
, buildPackages ? {}
|
||||||
|
@ -263,8 +261,9 @@ stdenv.mkDerivation {
|
||||||
## Man page and info support
|
## Man page and info support
|
||||||
##
|
##
|
||||||
|
|
||||||
ln -s ${cc.man} $man
|
mkdir -p $man/nix-support $info/nix-support
|
||||||
ln -s ${cc.info} $info
|
printWords ${cc.man or ""} >> $man/nix-support/propagated-build-inputs
|
||||||
|
printWords ${cc.info or ""} >> $info/nix-support/propagated-build-inputs
|
||||||
''
|
''
|
||||||
|
|
||||||
+ ''
|
+ ''
|
||||||
|
|
|
@ -88,6 +88,7 @@ in rec {
|
||||||
extraPackages = lib.optional (libcxx != null) libcxx;
|
extraPackages = lib.optional (libcxx != null) libcxx;
|
||||||
|
|
||||||
nativeTools = false;
|
nativeTools = false;
|
||||||
|
propagateDoc = false;
|
||||||
nativeLibc = false;
|
nativeLibc = false;
|
||||||
inherit buildPackages coreutils gnugrep bintools;
|
inherit buildPackages coreutils gnugrep bintools;
|
||||||
libc = last.pkgs.darwin.Libsystem;
|
libc = last.pkgs.darwin.Libsystem;
|
||||||
|
|
|
@ -90,6 +90,7 @@ let
|
||||||
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
|
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
|
||||||
name = "${name}-gcc-wrapper";
|
name = "${name}-gcc-wrapper";
|
||||||
nativeTools = false;
|
nativeTools = false;
|
||||||
|
propagateDoc = false;
|
||||||
nativeLibc = false;
|
nativeLibc = false;
|
||||||
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
|
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
|
||||||
inherit (prevStage) stdenv;
|
inherit (prevStage) stdenv;
|
||||||
|
|
Loading…
Reference in a new issue