nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 06:52:43 +01:00
Code Activity

nix-shell -p: Use runCommandCC

Browse source 
This restores pre-17.03 behaviour by making gcc available.

(Ported from 9b63bb88c8)
This commit is contained in:
Eelco Dolstra 2017-10-13 17:28:04 +02:00
parent 3c52567b3e
commit 76431e0a26
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/nix-build.in
View file

@ -226,7 +226,7 @@ die "$0: ‘-p’ and ‘-E’ are mutually exclusive\n" if $packages && $fromAr
if ($packages) { if ($packages) {
push @instArgs, "--expr"; push @instArgs, "--expr";
@exprs = ( @exprs = (
'with import <nixpkgs> { }; runCommand "shell" { buildInputs = [ ' 'with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) "shell" { buildInputs = [ '
. (join " ", map { "($_)" } @exprs) . ']; } ""'); . (join " ", map { "($_)" } @exprs) . ']; } ""');
} elsif (!$fromArgs) { } elsif (!$fromArgs) {
@exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix"; @exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix";