Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: Update patches for 2.0

Browse Source 
* Drop stat patch as was accepted upstream.
* NIX_REMOTE scheme is now URI based tcp://host:port
This commit is contained in:
Tyson Whitehead
2018-06-25 15:45:44 -04:00
parent fde6c31445
commit 01a6ed3f22
4 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/nix/cvmfs.patch
View File

@@ -1,12 +1,12 @@
diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index bb61e1c..d58d687 100755
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -276,6 +276,7 @@ foreach my $expr (@exprs) {
}
# NixOS hack: prevent /etc/bashrc from sourcing /etc/profile.
$ENV{'__ETC_PROFILE_SOURCED'} = 1;
+ $ENV{'SKIP_CC_CVMFS'} = 1;
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 99f77345..4f71fca1 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -372,6 +372,7 @@ void mainWrapped(int argc, char * * argv)
env = newEnv;
// NixOS hack: prevent /etc/bashrc from sourcing /etc/profile.
env["__ETC_PROFILE_SOURCED"] = "1";
+ env["SKIP_CC_CVMFS"] = "1";
}
$ENV{'NIX_BUILD_TOP'} = $ENV{'TMPDIR'} = $ENV{'TEMPDIR'} = $ENV{'TMP'} = $ENV{'TEMP'} = $tmp;
$ENV{'NIX_STORE'} = $Nix::Config::storeDir;
env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmp;