diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-24 19:23:42 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-24 19:23:42 +0000 |
| commit | 8cd050f6ba08dfe93c3f1b638e222f59a5b428d5 (patch) | |
| tree | f641514fdbe11af98fde49d1e4405095e65f6026 /pkgs/tools/package-management/rpm/default.nix | |
| parent | c26de115510a0921057356a984d466cf19ba80f6 (diff) | |
| download | nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar.gz nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar.bz2 nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar.lz nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar.xz nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.tar.zst nixpkgs-8cd050f6ba08dfe93c3f1b638e222f59a5b428d5.zip | |
rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions
Diffstat (limited to 'pkgs/tools/package-management/rpm/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index c0a4f7f693d..f4a7273d8cc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -11,13 +11,9 @@ 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 nss db bzip2 libarchive ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ]; - # Note: we don't add elfutils to buildInputs, since it provides a - # 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"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here |