dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

rpm: remove hack

Browse Source 
elfutils now adds a eu- prefix to avoid collisions
This commit is contained in:
Robin Gloster 2016-08-24 19:23:42 +00:00
parent c26de11551
commit 8cd050f6ba
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,13 +11,9 @@ 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 nss db bzip2 libarchive ]; propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ];
# Note: we don't add elfutils to buildInputs, since it provides a NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
# bad `ld' and other stuff.
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${elfutils}/include";
NIX_CFLAGS_LINK = "-L${elfutils}/lib";
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