diff options
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 7d191ccaba55..2d73a2680381 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -4,8 +4,6 @@ , python, zlib, perl, texLive, texinfo, xz }: -assert stdenv.isLinux; - let s = # Generated upstream information rec { @@ -17,10 +15,12 @@ let sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; }; buildInputs = [ - freeglut ghostscriptX imagemagick fftw - boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv - python zlib perl texLive texinfo xz - ]; + ghostscriptX imagemagick fftw + boehmgc ncurses readline gsl libsigsegv + python zlib perl texLive texinfo xz ] + ++ stdenv.lib.optionals stdenv.isLinux + [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + ; in stdenv.mkDerivation { inherit (s) name version; @@ -51,11 +51,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit (s) version; description = "A tool for programming graphics intended to replace Metapost"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raskin maintainers.peti ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8fa7af3b1f8e..3b537fad91db 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt ] + ++ lib.optional withQt qt # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; |
