From 2e04cdd240ff3439779928721bdc0fa6ff813346 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Feb 2022 12:18:35 -0600 Subject: [PATCH] boehmgc: drop musl flags, per upstream's note (!) (#157625) https://github.com/NixOS/nixpkgs/commit/0938316e058850460ea206c8eb2ebb819cdee493#commitcomment-63005097 Resulting binaries are identifical according to diffoscope (other than embedded /nix/store/.../ paths). FWIW, going back through versions we've packaged, the most recent instance where these flags produced differing outputs was in 7.6.8 (comparing $out's only, FWIW). --- pkgs/development/libraries/boehm-gc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b20bdac9087..d5057a61484 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" - ''; - # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;