alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nlopt: rescue build by dropping support for Octave

Browse source
This commit is contained in:
Peter Simons 2017-03-06 10:25:56 +01:00
parent c5563b48ba
commit e7b68767a8
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/nlopt/default.nix
View file

@ -16,16 +16,12 @@ stdenv.mkDerivation rec {
"M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
"OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
preConfigure = ''
find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
'';
meta = { meta = {
homepage = "http://ab-initio.mit.edu/nlopt/"; homepage = "http://ab-initio.mit.edu/nlopt/";
description = "Free open-source library for nonlinear optimization"; description = "Free open-source library for nonlinear optimization";
license = stdenv.lib.licenses.lgpl21Plus; license = stdenv.lib.licenses.lgpl21Plus;
hydraPlatforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.linux;
broken = true; # cannot cope with Octave 4.x broken = (octave != null); # cannot cope with Octave 4.x
}; };
} }

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

@ -3106,7 +3106,7 @@ with pkgs;
nkf = callPackage ../tools/text/nkf {}; nkf = callPackage ../tools/text/nkf {};
nlopt = callPackage ../development/libraries/nlopt {}; nlopt = callPackage ../development/libraries/nlopt { octave = null; };
npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {};