stxxl: fix build on darwin
Do not enable OpenMP support on Darwin. Since GNU Parallel requires
OpenMP, also disable it on Darwin.
commit53fd52dca90798b0fae2bb5381e3f4e3bcb73a57
authorSebastián Mancilla <smancill@smancill.dev>
dateThu 18 Nov 2021, 13:43 (5 years ago)
parent8ea3df5
pkgs/development/libraries/stxxl/default.nix+4−3
@@ -2,7 +2,7 @@
22, stdenv
33, fetchFromGitHub
44, cmake
5−, parallel ? true
5+, parallelSupport ? (!stdenv.isDarwin)
66}:
77
88let
@@ -25,11 +25,12 @@ stdenv.mkDerivation rec {
2525 cmakeFlags = [
2626 "-DBUILD_SHARED_LIBS=ON"
2727 "-DBUILD_STATIC_LIBS=OFF"
28− (mkFlag parallel "USE_GNU_PARALLEL")
28+ (mkFlag parallelSupport "USE_GNU_PARALLEL")
29+ (mkFlag parallelSupport "USE_OPENMP")
2930 ];
3031
3132 passthru = {
32− inherit parallel;
33+ inherit parallelSupport;
3334 };
3435
3536 meta = with lib; {
pkgs/top-level/all-packages.nix+1−1
@@ -19675,7 +19675,7 @@ with pkgs;
1967519675
1967619676 StormLib = callPackage ../development/libraries/StormLib { };
1967719677
19678− stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
19678+ stxxl = callPackage ../development/libraries/stxxl { };
1967919679
1968019680 sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
1968119681