cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/patchelf-0.9' into staging

Browse source
This commit is contained in:
Eelco Dolstra 2016-02-29 11:36:31 +01:00
commit 843373ef8c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/misc/patchelf/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchelf-0.8";
name = "patchelf-0.9";
src = fetchurl {
url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};
setupHook = [ ./setup-hook.sh ];

2
pkgs/tools/graphics/netpbm/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
touch lib/standardppmdfont.c
'';
enableParallelBuilding = true;
enableParallelBuilding = false;
installPhase = ''
make package pkgdir=$out