diff options
| -rw-r--r-- | pkgs/build-support/vm/test.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index c742a05aa112..738a5008882c 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -8,13 +8,13 @@ rec { buildPatchelfInVM = runInLinuxVM patchelf; - testRPMImage = makeImageTestScript diskImages.fedora8i386; + testRPMImage = makeImageTestScript diskImages.fedora16i386; buildPatchelfRPM = buildRPM { name = "patchelf-rpm"; src = patchelf.src; - diskImage = diskImages.fedora13i386; + diskImage = diskImages.fedora16x86_64; }; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index f9c942f333ea..b35d3b66ad83 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -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 { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { 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 # bad `ld' and other stuff. |