diff options
| author | Anthony Cowley <acowley@gmail.com> | 2017-03-22 10:49:10 -0400 |
|---|---|---|
| committer | Anthony Cowley <acowley@gmail.com> | 2017-03-22 10:49:10 -0400 |
| commit | 506a5df01421715376c0985ea9cb417aae5c3e56 (patch) | |
| tree | bf46811561ba16c49ec7ee14f7fcb2a6c6817dfe /pkgs/development/interpreters/octave | |
| parent | 8869816ed2c532b439173e58511b994d80d88ef9 (diff) | |
| download | nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar.gz nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar.bz2 nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar.lz nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar.xz nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.tar.zst nixpkgs-506a5df01421715376c0985ea9cb417aae5c3e56.zip | |
octave: fix on darwin
This change is required on darwin, but did not make it into the 4.2.1 release of Octave. It is a very small change, and a comment on the patch includes a link for more information and a note that it should be removed from subsequent releases.
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1c8644b1889..3233baea8f4 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ; + # REMOVE ON VERSION BUMP + # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc + ''; + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; |