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

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

Browse Source 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
This commit is contained in:
Shea Levy
2015-02-02 21:14:28 -05:00
parent acbf8eb561 cfb29ab882
commit c45372f038
153 changed files with 419 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/yandex-disk/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@ assert stdenv.isLinux;
let
p = if stdenv.is64bit then {
arch = "x86_64";
gcclib = "${stdenv.cc.gcc}/lib64";
gcclib = "${stdenv.cc.cc}/lib64";
sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw";
}
else {
arch = "i386";
gcclib = "${stdenv.cc.gcc}/lib";
gcclib = "${stdenv.cc.cc}/lib";
sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426";
};
in