diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-11-08 16:15:55 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2020-11-08 16:15:55 +0100 |
| commit | 9621822607fc3c37c2f7c23505ec8de8f567644a (patch) | |
| tree | 2c3dc8b684fd24023320f239fd8aae6c84b21c69 /pkgs/tools/graphics/asymptote | |
| parent | 6519e0b796addb4d28f7852bdcafcbb0b8b3fe62 (diff) | |
| download | nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar.gz nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar.bz2 nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar.lz nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar.xz nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.tar.zst nixpkgs-9621822607fc3c37c2f7c23505ec8de8f567644a.zip | |
asymptote: 2.66 -> 2.67; fix build with fresh ghostscript
Diffstat (limited to 'pkgs/tools/graphics/asymptote')
| -rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/graphics/asymptote/default.upstream | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 67afac2cdcc..6b8c6870a66 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages -, zlib, perl +, zlib, perl, curl , texLive, texinfo , darwin }: stdenv.mkDerivation rec { - version = "2.66"; + version = "2.67"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; 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 = [ autoreconfHook bison @@ -30,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl + zlib perl curl texLive ] ++ (with python3Packages; [ python diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/pkgs/tools/graphics/asymptote/default.upstream deleted file mode 100644 index e86d81ba443..00000000000 --- a/pkgs/tools/graphics/asymptote/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/asymptote/files/ -SF_version_dir -version_link 'src[.]tgz/download$' -SF_redirect |