From 67c73aafe81cd510da97f9d38d9eccc91985aff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 22 Dec 2012 22:04:43 +0100
Subject: [PATCH] Fixing distccMasquerade to have gas too

---
 pkgs/development/tools/misc/distcc/masq.nix | 12 +++++++++++-
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

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) {