about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boehm-gc/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/boehm-gc/default.nix17
1 files changed, 3 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
index d6ebaf3c5663..a241b42e1878 100644
--- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops
+{ lib, stdenv, fetchurl
 , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
 }:
 
@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
   };
 
-  buildInputs = [ libatomic_ops ];
-  nativeBuildInputs = [ pkgconfig ];
-
   outputs = [ "out" "dev" "doc" ];
   separateDebugInfo = stdenv.isLinux;
 
@@ -29,20 +26,12 @@ stdenv.mkDerivation rec {
     lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
 
   configureFlags =
-    [ "--enable-cplusplus" ]
+    [ "--enable-cplusplus" "--with-libatomic-ops=none" ]
     ++ lib.optional enableLargeConfig "--enable-large-config"
-    ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"
-    # Configure script can't detect whether C11 atomic intrinsics are available
-    # when cross-compiling, so it links to libatomic_ops, which has to be
-    # propagated to all dependencies. To avoid this, assume that the intrinsics
-    # are available.
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none";
+    ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
 
   doCheck = true; # not cross;
 
-  # Don't run the native `strip' when cross-compiling.
-  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
-
   enableParallelBuilding = true;
 
   meta = {