From fed7d4a6e95fa715ec3e28221790c8ec11d9a9c4 Mon Sep 17 00:00:00 2001 From: armijnhemel Date: Sat, 15 Apr 2017 10:18:04 +0200 Subject: [PATCH] RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910) --- pkgs/tools/package-management/rpm/default.nix | 13 ++++++++----- .../rpm/rpm-4.13.0.1-bfd-config.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6c3a63119b06..c5a929ccd6f8 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }: stdenv.mkDerivation rec { - name = "rpm-4.13.0-rc1"; + name = "rpm-${version}"; + version = "4.13.0.1"; src = fetchurl { - url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; - sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; + url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; + sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; }; outputs = [ "out" "dev" "man" ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements - propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch new file mode 100644 index 000000000000..b8192b24f134 --- /dev/null +++ b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch @@ -0,0 +1,11 @@ +diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c +--- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 ++++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #define _(x) x