public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40898 from obsidiansystems/requireFile-without-cc

Browse Source 
requireFile: Use stdenvNoCC
This commit is contained in:
John Ericson 2018-05-21 19:48:02 -04:00 committed by GitHub
commit 67682550ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/trivial-builders.nix
View File

@ -157,14 +157,14 @@ rec {
hash = if sha256 != null then sha256 else sha1; hash = if sha256 != null then sha256 else sha1;
name_ = if name == null then baseNameOf (toString url) else name; name_ = if name == null then baseNameOf (toString url) else name;
in in
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = name_; name = name_;
outputHashMode = hashMode; outputHashMode = hashMode;
outputHashAlgo = hashAlgo; outputHashAlgo = hashAlgo;
outputHash = hash; outputHash = hash;
preferLocalBuild = true; preferLocalBuild = true;
builder = writeScript "restrict-message" '' builder = writeScript "restrict-message" ''
source ${stdenv}/setup source ${stdenvNoCC}/setup
cat <<_EOF_ cat <<_EOF_
*** ***