diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-11 08:59:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-11 08:59:54 +0200 |
| commit | ae8eee9c3f97ba4973da524094a5f1fab592b70a (patch) | |
| tree | e950225203c30bf1144d9baeedb25c8cf23604a4 /pkgs/development/tools/misc/elfutils/default.nix | |
| parent | bb9f138f00f4b77218e50ecf905074c238c2b4f2 (diff) | |
| parent | c87c474b17af792e7984ef4f058291f7ce06f594 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc/elfutils/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/elfutils/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 9a4ff149609e9..4ad7f83006651 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }: +{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { @@ -17,10 +17,15 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; - buildInputs = [ zlib bzip2 xz ]; + buildInputs = [ zlib bzip2 xz ] + ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + ''; + configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" |