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

darwin binutils: Better handling of man pages and info

Browse Source
This commit is contained in:
John Ericson 2017-11-26 14:46:34 -05:00
parent ef178be597
commit cebe1b4c08
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
./disambiguate-arm-targets.patch ./disambiguate-arm-targets.patch
]; ];
outputs = [ "out" "info" ]; outputs = [ "out" "info" "man" ];
nativeBuildInputs = [ bison buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison buildPackages.stdenv.cc ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];

9
pkgs/os-specific/darwin/binutils/default.nix
View File

@ -17,6 +17,7 @@ in
# TODO loop over targetPrefixed binaries too # TODO loop over targetPrefixed binaries too
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${targetPrefix}cctools-binutils-darwin"; name = "${targetPrefix}cctools-binutils-darwin";
outputs = [ "out" "info" "man" ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin $out/include mkdir -p $out/bin $out/include
@ -37,10 +38,16 @@ stdenv.mkDerivation {
ln -sf "${cctools}/bin/$i" "$out/bin/$i" ln -sf "${cctools}/bin/$i" "$out/bin/$i"
done done
# FIXME: this will give us incorrect man pages for bits of cctools
ln -s ${binutils-raw.bintools.out}/share $out/share ln -s ${binutils-raw.bintools.out}/share $out/share
ln -s ${cctools}/libexec $out/libexec ln -s ${cctools}/libexec $out/libexec
mkdir -p "$info/nix-support" "$man/nix-support"
printWords ${binutils-raw.bintools.info} \
>> $info/nix-support/propagated-build-inputs
# FIXME: cctools missing man pages
printWords ${binutils-raw.bintools.man} \
>> $man/nix-support/propagated-build-inputs
''; '';
passthru = { passthru = {