about summary refs log tree commit diff
path: root/pkgs/development/libraries/nlopt
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2013-06-17 12:38:19 +0200
committerLluís Batlle i Rossell <viric@viric.name>2013-06-17 12:47:45 +0200
commit2c715069296549d88dd525c1f7e822c449291ae0 (patch)
tree23c4f37089c4a8ad7ecfe87f8a0e0450806f3d57 /pkgs/development/libraries/nlopt
parenta33fd118f5aff239082e50f88fc7af5114c85092 (diff)
downloadnixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar.gz
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar.bz2
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar.lz
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar.xz
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.tar.zst
nixlib-2c715069296549d88dd525c1f7e822c449291ae0.zip
nlopt: build octave plugins
Diffstat (limited to 'pkgs/development/libraries/nlopt')
-rw-r--r--pkgs/development/libraries/nlopt/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 0936332cd489..cc216a59d758 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,12 +1,19 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv
+, withOctave ? true, octave ? null}:
 
 stdenv.mkDerivation rec {
-  name = "nlopt-2.2.1";
+  name = "nlopt-2.3";
 
   src = fetchurl {
     url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz";
-    sha256 = "0p7ri7dcp6vga7jwng7wj9bf2ixk6p5ldxp76r93xkrdixqfngaq";
+    sha256 = "1iw2cjgypyqz779f47fz0nmifbrvk4zs4rxi1ibk36f4ly3wg6p6";
   };
 
-  configureFlags = "--with-cxx --with-pic --without-guile --without-python --without-octave --without-matlab";
+  buildInputs = stdenv.lib.optional withOctave octave;
+
+  configureFlags = "--with-cxx --enable-shared --with-pic --without-guile --without-python
+  --without-matlab " +
+    stdenv.lib.optionalString withOctave ("--with-octave " +
+        "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
+        "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 }