ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-04 03:27:38 +03:00
Code Issues Projects Releases Wiki Activity

stxxl: fix build on darwin

Browse Source 
Do not enable OpenMP support on Darwin. Since GNU Parallel requires
OpenMP, also disable it on Darwin.
This commit is contained in:
Sebastián Mancilla 2021-11-18 13:43:52 -03:00
parent 8ea3df51cd
commit 53fd52dca9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/stxxl/default.nix
View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, parallel ? true , parallelSupport ? (!stdenv.isDarwin)
}: }:
let let
@ -25,11 +25,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF"
(mkFlag parallel "USE_GNU_PARALLEL") (mkFlag parallelSupport "USE_GNU_PARALLEL")
(mkFlag parallelSupport "USE_OPENMP")
]; ];
passthru = { passthru = {
inherit parallel; inherit parallelSupport;
}; };
meta = with lib; { meta = with lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -19675,7 +19675,7 @@ with pkgs;
StormLib = callPackage ../development/libraries/StormLib { }; StormLib = callPackage ../development/libraries/StormLib { };
stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; stxxl = callPackage ../development/libraries/stxxl { };
sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); sqlite = lowPrio (callPackage ../development/libraries/sqlite { });