From 53fd52dca90798b0fae2bb5381e3f4e3bcb73a57 Mon Sep 17 00:00:00 2001 From: Sebastián Mancilla Date: Thu, 18 Nov 2021 13:43:52 -0300 Subject: stxxl: fix build on darwin Do not enable OpenMP support on Darwin. Since GNU Parallel requires OpenMP, also disable it on Darwin. --- pkgs/development/libraries/stxxl/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 5cc0e6037a23d..391424ee2c93d 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de60fe4c6388..4aa26ab206e4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }); -- cgit 1.4.1