JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
See discussion in #44516.
This commit is contained in:
Jan Malakhovski 2018-08-06 15:26:51 +00:00
parent 28ad0703f3
commit 02c09e0171
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/bintools-wrapper/default.nix
View File

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

9
pkgs/build-support/cc-wrapper/default.nix
View File

@ -6,8 +6,10 @@
# compiler and the linker just "work". # compiler and the linker just "work".
{ name ? "" { name ? ""
, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , stdenvNoCC
, 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 ? {}
@ -261,9 +263,8 @@ stdenv.mkDerivation {
## Man page and info support ## Man page and info support
## ##
mkdir -p $man/nix-support $info/nix-support ln -s ${cc.man} $man
printWords ${cc.man or ""} >> $man/nix-support/propagated-build-inputs ln -s ${cc.info} $info
printWords ${cc.info or ""} >> $info/nix-support/propagated-build-inputs
'' ''
+ '' + ''

1
pkgs/stdenv/darwin/default.nix
View File

@ -88,7 +88,6 @@ 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;

1
pkgs/stdenv/linux/default.nix
View File

@ -90,7 +90,6 @@ 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;