pyrox.dev
Merge pull request #146499 from smancill/ZHF-stxxl
+4
-3
pkgs/development/libraries/stxxl/default.nix
+4
-3
pkgs/development/libraries/stxxl/default.nix
···
2
2
, stdenv
3
3
, fetchFromGitHub
4
4
, cmake
5
-
, parallel ? true
5
+
, parallelSupport ? (!stdenv.isDarwin)
6
6
}:
7
7
8
8
let
···
25
25
cmakeFlags = [
26
26
"-DBUILD_SHARED_LIBS=ON"
27
27
"-DBUILD_STATIC_LIBS=OFF"
28
-
(mkFlag parallel "USE_GNU_PARALLEL")
28
+
(mkFlag parallelSupport "USE_GNU_PARALLEL")
29
+
(mkFlag parallelSupport "USE_OPENMP")
29
30
];
30
31
31
32
passthru = {
32
-
inherit parallel;
33
+
inherit parallelSupport;
33
34
};
34
35
35
36
meta = with lib; {
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
19677
19677
19678
19678
StormLib = callPackage ../development/libraries/StormLib { };
19679
19679
19680
-
stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
19680
+
stxxl = callPackage ../development/libraries/stxxl { };
19681
19681
19682
19682
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
19683
19683