Skip to content

Commit

Permalink
nix-shell -p: Use runCommandCC
Browse files Browse the repository at this point in the history
This restores pre-17.03 behaviour by making gcc available.

(Ported from 9b63bb8)
  • Loading branch information
edolstra committed Oct 13, 2017
1 parent 3c52567 commit 76431e0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/nix-build.in
Expand Up @@ -226,7 +226,7 @@ die "$0: ‘-p’ and ‘-E’ are mutually exclusive\n" if $packages && $fromAr
if ($packages) {
push @instArgs, "--expr";
@exprs = (
'with import <nixpkgs> { }; runCommand "shell" { buildInputs = [ '
'with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) "shell" { buildInputs = [ '
. (join " ", map { "($_)" } @exprs) . ']; } ""');
} elsif (!$fromArgs) {
@exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix";
Expand Down

1 comment on commit 76431e0

@copumpkin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the plan is for nix use to have no CC but nix shell to have CC, in the new UI?

Please sign in to comment.