diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-06 01:51:46 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-06 01:51:46 -0400 |
| commit | 80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb (patch) | |
| tree | 217bfa28eba7794cf69f9f924b1559fabdcdc01c | |
| parent | f2cafb162650204367a277d75bc4dc0f8a8580f5 (diff) | |
| download | nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar.gz nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar.bz2 nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar.lz nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar.xz nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.tar.zst nixpkgs-80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb.zip | |
elfutils: add argp-standalone for musl
https://hydra.nixos.org/build/123111192
| -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 56bfe26ec06..9440463e83f 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" |