mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-04 03:27:38 +03:00
stxxl: fix build on darwin
Do not enable OpenMP support on Darwin. Since GNU Parallel requires OpenMP, also disable it on Darwin.
This commit is contained in:
parent
8ea3df51cd
commit
53fd52dca9
@ -2,7 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, parallel ? true
|
||||
, parallelSupport ? (!stdenv.isDarwin)
|
||||
}:
|
||||
|
||||
let
|
||||
@ -25,11 +25,12 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_STATIC_LIBS=OFF"
|
||||
(mkFlag parallel "USE_GNU_PARALLEL")
|
||||
(mkFlag parallelSupport "USE_GNU_PARALLEL")
|
||||
(mkFlag parallelSupport "USE_OPENMP")
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit parallel;
|
||||
inherit parallelSupport;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -19675,7 +19675,7 @@ with pkgs;
|
||||
|
||||
StormLib = callPackage ../development/libraries/StormLib { };
|
||||
|
||||
stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
|
||||
stxxl = callPackage ../development/libraries/stxxl { };
|
||||
|
||||
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user