about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-13 21:56:43 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-13 21:56:43 -0700
commit48534df2a4c0c090b4d1b8074c74fe807bb96b9e (patch)
treecbce51f6eeeb6817d24c37e7669836ed838ba0a2
parent38bf485e72615ffe7828fe4cbd147332209b375a (diff)
parente9b093bc9851a05eac2e1a0a9340c0c3a8d4e605 (diff)
downloadnixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar.gz
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar.bz2
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar.lz
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar.xz
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.tar.zst
nixlib-48534df2a4c0c090b4d1b8074c74fe807bb96b9e.zip
Merge pull request #7741 from codyopel/stxxl
stxxl: refactor
-rw-r--r--pkgs/development/libraries/stxxl/default.nix30
1 files changed, 22 insertions, 8 deletions
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 23590f17ca88..9fb25aa36e0a 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -1,24 +1,38 @@
-{stdenv, fetchurl, cmake, parallel ? true }:
+{ stdenv, fetchurl, cmake
+, parallel ? true
+}:
+
+let
+  mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF";
+in
 
 stdenv.mkDerivation rec {
-  name = "stxxl-1.4.1";
+  name = "stxxl-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz";
+    url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";
     sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}";
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=OFF"
+    "-DCMAKE_BUILD_TYPE=Release"
+    (mkFlag parallel "USE_GNU_PARALLEL")
+  ];
 
   passthru = {
     inherit parallel;
   };
 
-  meta = {
-    homepage = https://github.com/stxxl/stxxl;
+  meta = with stdenv.lib; {
     description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
-    license = stdenv.lib.licenses.boost;
+    homepage = https://github.com/stxxl/stxxl;
+    license = licenses.boost;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.all;
   };
 }