From 9b63bb88c8873d192b8b01608e5d230817dd3375 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Apr 2017 12:04:01 +0200
Subject: nix-shell -p: Use runCommandCC

This restores pre-17.03 behaviour by making gcc available.
---
 src/nix-build/nix-build.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix-build/nix-build.cc')

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index b4206033cf5f..bb031d515134 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -325,7 +325,7 @@ int main(int argc, char ** argv)
         if (packages) {
             instArgs.push_back("--expr");
             std::ostringstream joined;
-            joined << "with import <nixpkgs> { }; runCommand \"shell\" { buildInputs = [ ";
+            joined << "with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ ";
             for (const auto & i : exprs)
                 joined << '(' << i << ") ";
             joined << "]; } \"\"";
-- 
cgit 1.4.1