diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 67afac2cdccd..6b8c6870a668 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/infra/libkookie/nixpkgs/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 |