aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/tools/misc/distcc
diff options
context:
space:
mode:
authorAristid Breitkreuz <aristidb@gmail.com>2014-11-16 13:52:17 +0100
committerAristid Breitkreuz <aristidb@gmail.com>2014-11-16 13:52:28 +0100
commit1dfd467c1476d57cf218bad20148d194099c253f (patch)
tree97f646b697b2f2c4ced1fb97a87381426d1a2730 /pkgs/development/tools/misc/distcc
parentb69238542c69fa21498ec5a262c25e69b2d5130f (diff)
distcc: fix evaluation (fixes #5002)
Diffstat (limited to 'pkgs/development/tools/misc/distcc')
-rw-r--r--pkgs/development/tools/misc/distcc/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 565d7835f05..300e15f1317 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -41,11 +41,10 @@ let
#
# extraConfig is meant to be sh lines exporting environment
# variables like DISTCC_HOSTS, DISTCC_DIR, ...
- links = extraConfig : (runCommand "distcc-links"
- { inherit (gcc) langC langCC; }
+ links = extraConfig : (runCommand "distcc-links" { }
''
mkdir -p $out/bin
- if [ $langC -eq 1 ]; then
+ if [ -x "${gcc.gcc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
#!/bin/sh
${extraConfig}
@@ -53,7 +52,7 @@ let
EOF
chmod +x $out/bin/gcc
fi
- if [ $langCC -eq 1 ]; then
+ if [ -x "${gcc.gcc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF
#!/bin/sh
${extraConfig}