From 1dfd467c1476d57cf218bad20148d194099c253f Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 16 Nov 2014 13:52:17 +0100 Subject: [PATCH] distcc: fix evaluation (fixes #5002) --- pkgs/development/tools/misc/distcc/default.nix | 7 +++---- 1 file 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}