diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index fe2c4193e25e..117480670c39 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -1,4 +1,4 @@ -{ stdenv, gccRaw }: +{ stdenv, gccRaw, binutils }: stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; @@ -27,5 +27,15 @@ stdenv.mkDerivation { ln -sf $bin/*-g++ $out/bin/c++ done 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 + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61baf5434af5..5b50a494de3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3094,6 +3094,7 @@ let distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { gccRaw = gcc.gcc; + binutils = binutils; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {