diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-10 19:01:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-13 00:47:48 -0500 |
commit | d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410 (patch) | |
tree | 075aa2008d4bd95a79b8c63827284cc69764c58b /pkgs/tools/package-management/rpm/default.nix | |
parent | f72bffb4c4178bf648bffff2a6692684f69551cd (diff) | |
download | nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.gz nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.bz2 nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.lz nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.xz nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.zst nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.zip |
treewide: Try to avoid depending on binutils directly
One should depend on - `stdenv.cc.bintools`: for executables at build time - `libbfd` or `libiberty`: for those libraries - `targetPackages.cc.bintools`: for exectuables at *run* time - `binutils`: only for specifically GNU Binutils's executables, regardless of the host platform, at run time.
Diffstat (limited to 'pkgs/tools/package-management/rpm/default.nix')
-rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 0e9ef3876d2..25fcb8bc27e 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }: +{ stdenv +, pkgconfig, autoreconfHook +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua +}: stdenv.mkDerivation rec { name = "rpm-${version}"; @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements - propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive libbfd ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; |