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

* We accidentally lost xz support in rpm. This broke RPM builds

Browse Source 
(http://hydra.nixos.org/build/2230623).

svn path=/nixpkgs/trunk/; revision=32847
This commit is contained in:
Eelco Dolstra 2012-03-07 09:47:22 +00:00
parent 6adea06e1c
commit ed325cd1ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/vm/test.nix
View File

@ -8,13 +8,13 @@ rec {
buildPatchelfInVM = runInLinuxVM patchelf; buildPatchelfInVM = runInLinuxVM patchelf;
testRPMImage = makeImageTestScript diskImages.fedora8i386; testRPMImage = makeImageTestScript diskImages.fedora16i386;
buildPatchelfRPM = buildRPM { buildPatchelfRPM = buildRPM {
name = "patchelf-rpm"; name = "patchelf-rpm";
src = patchelf.src; src = patchelf.src;
diskImage = diskImages.fedora13i386; diskImage = diskImages.fedora16x86_64;
}; };

4
pkgs/tools/package-management/rpm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4 }: { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rpm-4.7.2"; name = "rpm-4.7.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
}; };
buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 ]; buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ];
# Note: we don't add elfutils to buildInputs, since it provides a # Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff. # bad `ld' and other stuff.