diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/stxxl/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/stxxl/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/nixpkgs/pkgs/development/libraries/stxxl/default.nix index eec4f722d411..391424ee2c93 100644 --- a/nixpkgs/pkgs/development/libraries/stxxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/stxxl/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchurl, cmake -, parallel ? true +{ lib +, stdenv +, fetchFromGitHub +, cmake +, parallelSupport ? (!stdenv.isDarwin) }: let @@ -10,9 +13,11 @@ stdenv.mkDerivation rec { pname = "stxxl"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz"; - sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; + src = fetchFromGitHub { + owner = "stxxl"; + repo = "stxxl"; + rev = version; + sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I="; }; nativeBuildInputs = [ cmake ]; @@ -20,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; { |