summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2018-05-21 19:48:02 -0400
committerGitHub <noreply@github.com>2018-05-21 19:48:02 -0400
commit67682550ed6b8b9729b603ccdfc84319f93804d8 (patch)
tree5cc3bd77e18cb20faf5cae19da0e47a3a4cd9b27
parentfe79fc0be4f3e27d634fbcb27c43eed948d285ce (diff)
parent9ec53a397ff52ec8a94a5bc6b603bff357c1fdd0 (diff)
downloadnixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar.gz
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar.bz2
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar.lz
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar.xz
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.tar.zst
nixlib-67682550ed6b8b9729b603ccdfc84319f93804d8.zip
Merge pull request #40898 from obsidiansystems/requireFile-without-cc
requireFile: Use stdenvNoCC
-rw-r--r--pkgs/build-support/trivial-builders.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 2ec56c94763a..73da775f7f56 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -157,14 +157,14 @@ rec {
       hash = if sha256 != null then sha256 else sha1;
       name_ = if name == null then baseNameOf (toString url) else name;
     in
-    stdenv.mkDerivation {
+    stdenvNoCC.mkDerivation {
       name = name_;
       outputHashMode = hashMode;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;
       builder = writeScript "restrict-message" ''
-        source ${stdenv}/setup
+        source ${stdenvNoCC}/setup
         cat <<_EOF_
 
         ***