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.
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
{ stdenv, fetchgit, autoconf, automake, utillinux, openssl, libuuid, gnu-efi
|
||||
, binutils, pkgconfig, help2man }:
|
||||
{ stdenv
|
||||
, fetchgit, autoconf, automake, pkgconfig, help2man
|
||||
, utillinux, openssl, libuuid, gnu-efi, libbfd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbsigntool-${version}";
|
||||
@@ -15,8 +17,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils help2man ];
|
||||
nativeBuildInputs = [ autoconf automake pkgconfig help2man ];
|
||||
buildInputs = [ utillinux openssl libuuid gnu-efi libbfd ];
|
||||
|
||||
configurePhase = ''
|
||||
substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}"
|
||||
|
||||
Reference in New Issue
Block a user