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

asymptote: 2.66 -> 2.67; fix build with fresh ghostscript

Browse Source
This commit is contained in:
Michael Raskin 2020-11-08 16:15:55 +01:00
parent 6519e0b796
commit 9621822607
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/graphics/asymptote/default.nix
View File

@ -1,24 +1,32 @@
{ stdenv, fetchFromGitHub, fetchurl { stdenv, fetchFromGitHub, fetchurl, fetchpatch
, autoreconfHook, bison, glm, yacc, flex , autoreconfHook, bison, glm, yacc, flex
, freeglut, ghostscriptX, imagemagick, fftw , freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python3Packages , python3Packages
, zlib, perl , zlib, perl, curl
, texLive, texinfo , texLive, texinfo
, darwin , darwin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.66"; version = "2.67";
pname = "asymptote"; pname = "asymptote";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vectorgraphics"; owner = "vectorgraphics";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd"; sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l";
}; };
patches =
(stdenv.lib.optional (stdenv.lib.versionOlder version "2.68")
(fetchpatch {
url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
}))
;
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
bison bison
@ -30,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ghostscriptX imagemagick fftw ghostscriptX imagemagick fftw
boehmgc ncurses readline gsl libsigsegv boehmgc ncurses readline gsl libsigsegv
zlib perl zlib perl curl
texLive texLive
] ++ (with python3Packages; [ ] ++ (with python3Packages; [
python python

4
pkgs/tools/graphics/asymptote/default.upstream
View File

@ -1,4 +0,0 @@
url https://sourceforge.net/projects/asymptote/files/
SF_version_dir
version_link 'src[.]tgz/download$'
SF_redirect