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

Fixing distccMasquerade to have gas too

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-22 22:04:43 +01:00
parent d779fc2da9
commit 67c73aafe8
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/misc/distcc/masq.nix
View File

@ -1,4 +1,4 @@
{ stdenv, gccRaw }: { stdenv, gccRaw, binutils }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}"; name = "distcc-masq-${gccRaw.name}";
@ -27,5 +27,15 @@ stdenv.mkDerivation {
ln -sf $bin/*-g++ $out/bin/c++ ln -sf $bin/*-g++ $out/bin/c++
done done
fi fi
bbin=${binutils}/bin
if [ -f $bbin/as ]; then
ln -s $bbin/as $out/bin
else
for a in $bbin/*-as; do
ln -sf $bbin/*-as $out/bin/as
done
fi
''; '';
} }

1
pkgs/top-level/all-packages.nix
View File

@ -3094,6 +3094,7 @@ let
distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
gccRaw = gcc.gcc; gccRaw = gcc.gcc;
binutils = binutils;
}; };
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {