diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
commit | 10d0c68a9bb90f65684cd23ce96e93610f42a376 (patch) | |
tree | 69d35d6d434969af02e6bc6e3d7e0fb1308f4d1f /pkgs/tools/graphics | |
parent | a20dd9528b38dd02c4bf8e25f5f9e12fc9573f9f (diff) | |
parent | 65edeb8633de16792a84195f77a6b4ea408e2608 (diff) | |
download | nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.gz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.bz2 nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.lz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.xz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.zst nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 1d77bfe4250..9b7c4010791 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,74 +1,74 @@ -{stdenv, fetchurl, fetchpatch - , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv - , python, zlib, perl, texLive, texinfo, xz +{ stdenv, fetchFromGitHub, fetchurl +, autoreconfHook, bison, glm, yacc, flex +, freeglut, ghostscriptX, imagemagick, fftw +, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv +, python3Packages +, zlib, perl +, texLive, texinfo , darwin }: -let - s = # Generated upstream information - rec { - baseName="asymptote"; - version="2.47"; - name="${baseName}-${version}"; - hash="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.47/asymptote-2.47.src.tgz"; - sha256="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971"; - }; - buildInputs = [ - ghostscriptX imagemagick fftw - boehmgc ncurses readline gsl libsigsegv - python zlib perl texLive texinfo xz ] - ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL mesa.osmesa ] - ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) - ; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +stdenv.mkDerivation rec { + version = "2.60"; + pname = "asymptote"; - src = fetchurl { - inherit (s) url sha256; + src = fetchFromGitHub { + owner = "vectorgraphics"; + repo = pname; + rev = version; + sha256 = "1sr31r80jfswlx9a0p5bn85p6h7mq28fw8ihhnlbhphii6w8z2j9"; }; - patches = [ - # Remove when updating from 2.47 to 2.48 - # Compatibility with BoehmGC 7.6.8 - (fetchpatch { - url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch"; - sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1"; - }) + nativeBuildInputs = [ + autoreconfHook + bison + flex + yacc + texinfo ]; + buildInputs = [ + ghostscriptX imagemagick fftw + boehmgc ncurses readline gsl libsigsegv + zlib perl + texLive + ] ++ (with python3Packages; [ + python + pyqt5 + ]); + + propagatedBuildInputs = [ + glm + ] ++ stdenv.lib.optionals stdenv.isLinux [ + freeglut libGLU libGL mesa.osmesa + ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + OpenGL GLUT Cocoa + ]); + preConfigure = '' - export HOME="$PWD" - patchShebangs . - sed -e 's@epswrite@eps2write@g' -i runlabel.in - xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex - cp texinfo-*/doc/texinfo.tex doc/ - rm *.tar.gz - configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third" + HOME=$TMP ''; + configureFlags = [ + "--with-latex=$out/share/texmf/tex/latex" + "--with-context=$out/share/texmf/tex/context/third" + ]; + NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ]; postInstall = '' - mv -v "$out/share/info/asymptote/"*.info $out/share/info/ + mv $out/share/info/asymptote/*.info $out/share/info/ sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote - rm $out/share/info/dir + rm -f $out/share/info/dir - rm -rfv "$out"/share/texmf - mkdir -pv "$out"/share/emacs/site-lisp/${s.name} - mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name} + rm -rf $out/share/texmf + install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el ''; enableParallelBuilding = true; meta = with stdenv.lib; { - inherit (s) version; description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.peti ]; |