summary refs log tree commit diff
path: root/pkgs/development/libraries/pagmo2
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-12-02 11:11:38 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2018-12-18 10:01:25 -0500
commit3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2 (patch)
tree5488515d2e606acb786cff9ef5e5c883a064ddea /pkgs/development/libraries/pagmo2
parente60233db007a81eb846a39ca4a17db00d8d8cc26 (diff)
downloadnixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar.gz
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar.bz2
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar.lz
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar.xz
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.tar.zst
nixpkgs-3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2.zip
pagmo2: 2.8 -> 2.9 fix broken package
corrects the library nlopt location as well.
Diffstat (limited to 'pkgs/development/libraries/pagmo2')
-rw-r--r--pkgs/development/libraries/pagmo2/default.nix30
1 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index c680efa95f8..842fae5ea93 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -11,32 +11,34 @@
 
 stdenv.mkDerivation rec {
   name = "pagmo2-${version}";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchFromGitHub {
      owner = "esa";
      repo = "pagmo2";
      rev = "v${version}";
-     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
+     sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400";
   };
 
-  buildInputs = [ cmake eigen nlopt ipopt boost ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ eigen nlopt ipopt boost ];
 
-  preBuild = ''
-    cp -r $src/* .
-  '';
+  cmakeFlags = [
+    "-DPAGMO_BUILD_TESTS=no"
+    "-DPAGMO_WITH_EIGEN3=yes"
+    "-DPAGMO_WITH_NLOPT=yes"
+    "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so"
+    "-DPAGMO_WITH_IPOPT=yes"
+    "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'"
+  ];
 
-  cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no"
-                 "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes"
-                 "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
-                 "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
-
-  # All but one test pass skip for now (tests also take about 30 min to compile)
+  # tests pass but take 30+ minutes
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://esa.github.io/pagmo2/;
     description = "Scientific library for massively parallel optimization";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.costrouc ];
   };
 }