diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/rpm/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/rpm/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index fdcf9832e66..8acf57570d7 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,21 +1,22 @@ -{ stdenv +{ stdenv, lib , pkgconfig, autoreconfHook -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.14.2.1"; + version = "4.15.1"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; + url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; + sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; }; outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] |