BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #146499 from smancill/ZHF-stxxl

Browse source
This commit is contained in:
Sandro 2021-11-18 18:22:38 +01:00 committed by GitHub
commit 7099869c67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, 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; {

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

@ -19677,7 +19677,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 { });