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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
This commit is contained in:
Tuomas Tynkkynen
2018-01-14 21:18:27 +02:00
parent c08042ba4b b986078593
commit 6ed0fe7e45
410 changed files with 50480 additions and 46866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/compression/bsdiff/default.nix
+2 -2
View File
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
patches = [ ./include-systypes.patch ];
buildPhase = ''
cc -O3 -lbz2 bspatch.c -o bspatch
cc -O3 -lbz2 bsdiff.c -o bsdiff
$CC -O3 -lbz2 bspatch.c -o bspatch
$CC -O3 -lbz2 bsdiff.c -o bsdiff
'';
installPhase = ''