From 76431e0a2681dbdca8b7919c46c7c4ac87e1217b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Oct 2017 17:28:04 +0200 Subject: [PATCH] nix-shell -p: Use runCommandCC This restores pre-17.03 behaviour by making gcc available. (Ported from 9b63bb88c8873d192b8b01608e5d230817dd3375) --- scripts/nix-build.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nix-build.in b/scripts/nix-build.in index 7e8acaa4..7e3eec7f 100755 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -226,7 +226,7 @@ die "$0: ā€˜-pā€™ and ā€˜-Eā€™ are mutually exclusive\n" if $packages && $fromAr if ($packages) { push @instArgs, "--expr"; @exprs = ( - 'with import { }; runCommand "shell" { buildInputs = [ ' + 'with import { }; (pkgs.runCommandCC or pkgs.runCommand) "shell" { buildInputs = [ ' . (join " ", map { "($_)" } @exprs) . ']; } ""'); } elsif (!$fromArgs) { @exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix";