Merge pull request #146499 from smancill/ZHF-stxxl
commit7099869c67b96d36d0bbcce5922672377196aa70
authorSandro <sandro.jaeckel@gmail.com>
dateThu 18 Nov 2021, 18:22 (5 years ago)
parente5537e453fd52d
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
@@ -19677,7 +19677,7 @@ with pkgs;
1967719677
1967819678 StormLib = callPackage ../development/libraries/StormLib { };
1967919679
19680− stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
19680+ stxxl = callPackage ../development/libraries/stxxl { };
1968119681
1968219682 sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
1968319683