Merge pull request #19200 from vbgl/asymptote-on-darwin

asymptote: fix build on Darwin
This commit is contained in:
Graham Christensen 2016-10-05 09:19:35 -04:00 committed by GitHub
commit 78b5ce35ce

View File

@ -4,8 +4,6 @@
, python, zlib, perl, texLive, texinfo, xz , python, zlib, perl, texLive, texinfo, xz
}: }:
assert stdenv.isLinux;
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -17,10 +15,12 @@ let
sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
}; };
buildInputs = [ buildInputs = [
freeglut ghostscriptX imagemagick fftw ghostscriptX imagemagick fftw
boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv boehmgc ncurses readline gsl libsigsegv
python zlib perl texLive texinfo xz python zlib perl texLive texinfo xz ]
]; ++ stdenv.lib.optionals stdenv.isLinux
[ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
@ -51,11 +51,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
inherit (s) version; inherit (s) version;
description = "A tool for programming graphics intended to replace Metapost"; description = "A tool for programming graphics intended to replace Metapost";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti]; maintainers = [ maintainers.raskin maintainers.peti ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }