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

RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910)

Browse Source
This commit is contained in:
armijnhemel 2017-04-15 10:18:04 +02:00 committed by Jörg Thalheim
parent b7d2ffeb46
commit fed7d4a6e9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 { stdenv.mkDerivation rec {
name = "rpm-4.13.0-rc1"; name = "rpm-${version}";
version = "4.13.0.1";
src = fetchurl { src = fetchurl {
url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2";
sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d";
}; };
outputs = [ "out" "dev" "man" ]; 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 ]; 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 # 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"; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
@ -25,6 +26,8 @@ stdenv.mkDerivation rec {
"--sharedstatedir=/com" "--sharedstatedir=/com"
]; ];
patches = [ ./rpm-4.13.0.1-bfd-config.patch ];
postPatch = '' postPatch = ''
# For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable}

11
pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch Normal file
View File

@ -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 <error.h>
#include <libelf.h>
#include <gelf.h>
+#include <config.h>
#include <bfd.h>
#define _(x) x