diff options
author | Peter Simons <simons@cryp.to> | 2017-03-06 10:25:56 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-03-07 14:56:46 +0100 |
commit | e7b68767a88c53233a487f2b816c01710e0933ea (patch) | |
tree | 1fa666d1fce5afd1966455ce0eb4b61d9af02b5f | |
parent | c5563b48baabe42ee21c840997d2405888e3f65a (diff) | |
download | nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar.gz nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar.bz2 nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar.lz nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar.xz nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.tar.zst nixpkgs-e7b68767a88c53233a487f2b816c01710e0933ea.zip |
nlopt: rescue build by dropping support for Octave
-rw-r--r-- | pkgs/development/libraries/nlopt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 4e3db9b0d40..7561f3b322b 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -16,16 +16,12 @@ stdenv.mkDerivation rec { "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); - preConfigure = '' - find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g' - ''; - meta = { homepage = "http://ab-initio.mit.edu/nlopt/"; description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; - broken = true; # cannot cope with Octave 4.x + broken = (octave != null); # cannot cope with Octave 4.x }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212647f3719..f2641e4e39d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3106,7 +3106,7 @@ with pkgs; nkf = callPackage ../tools/text/nkf {}; - nlopt = callPackage ../development/libraries/nlopt {}; + nlopt = callPackage ../development/libraries/nlopt { octave = null; }; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; |