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

Merge pull request #19816 from veprbl/octave_fixes

Browse Source 
octave: darwin fix
This commit is contained in:
Daiderd Jordan
2016-11-05 10:49:33 +01:00
committed by GitHub
parent cb6a81c607 5994c12470
commit 3187b01720
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym";
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile
fftw fftwSinglePrec qrupdate arpack libwebp ]
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
fftwSinglePrec qrupdate arpack libwebp ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11])
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
;
doCheck = !stdenv.isDarwin;