From 0938316e058850460ea206c8eb2ebb819cdee493 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Feb 2019 13:25:42 -0600 Subject: [PATCH 1/2] boehmgc: fix CFLAGS w/musl so new args are separate (add a space first) --- pkgs/development/libraries/boehm-gc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index cdf72830797..c40fa044cfe 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; patches = [ (fetchpatch { From 9214f858432087f1fe80fe4550506839201ca7c3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Feb 2019 13:30:04 -0600 Subject: [PATCH 2/2] boehmgc_766: similarly fix CFLAGS w/musl to include space first --- pkgs/development/libraries/boehm-gc/7.6.6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index da71e40187f..68f5d7afcf4 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; patches = [ (fetchpatch {