From f2cafb162650204367a277d75bc4dc0f8a8580f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:50:55 -0400 Subject: [PATCH 1/2] argp-standalone: support all linux architectures --- pkgs/development/libraries/argp-standalone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 6544c4811875..f961c577aa7d 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = with platforms; darwin ++ [ "x86_64-linux" ]; + platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ amar1729 ]; license = licenses.gpl2; }; From 80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:51:46 -0400 Subject: [PATCH 2/2] elfutils: add argp-standalone for musl https://hydra.nixos.org/build/123111192 --- pkgs/development/tools/misc/elfutils/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 56bfe26ec069..9440463e83f3 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"