From 506a5df01421715376c0985ea9cb417aae5c3e56 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 22 Mar 2017 10:49:10 -0400 Subject: 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. --- pkgs/development/interpreters/octave/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1c8644b18899..3233baea8f40 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; -- cgit 1.4.1