public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24207 from acowley/octave-darwin-421

Browse Source 
octave: fix on darwin
This commit is contained in:
Michael Raskin 2017-03-22 16:36:00 +01:00 committed by GitHub
commit ec2c337ec5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/octave/default.nix
View File

@ -41,6 +41,12 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ++ (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; doCheck = !stdenv.isDarwin;
enableParallelBuilding = true; enableParallelBuilding = true;