summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2016-10-05 09:19:35 -0400
committerGitHub <noreply@github.com>2016-10-05 09:19:35 -0400
commit78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc (patch)
tree6b11da3d0fb428c8e7ba5ad5028376ab297e2800
parent5b11c34b5101988ea2f1c716d6373497dd459442 (diff)
parent3cb65da139d02fd7b08cd0d4c53fd1770b639774 (diff)
downloadnixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar.gz
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar.bz2
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar.lz
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar.xz
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.tar.zst
nixpkgs-78b5ce35ce26c3d71c43c6bd4dec6f3269c5bafc.zip
Merge pull request #19200 from vbgl/asymptote-on-darwin
asymptote: fix build on Darwin
-rw-r--r--pkgs/tools/graphics/asymptote/default.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 7d191ccaba5..2d73a268038 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;
   };
 }