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

octave: mesa and libX11 are not used on darwin

This commit is contained in:
Dmitry Kalinkin 2016-10-23 20:54:18 -04:00
parent f9b2f9bb92
commit 5994c12470
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 4 additions and 4 deletions
Show Stats 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"; sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym";
}; };
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
fftw fftwSinglePrec qrupdate arpack libwebp ] fftwSinglePrec qrupdate arpack libwebp ]
++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript) ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11]) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
; ;
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;