mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 08:13:04 +00:00
Merge pull request #103141 from 7c6f434c/asymptote-fix
asymptote: 2.66 -> 2.67; fix build with fresh ghostscript
This commit is contained in:
commit
5be2bb9e5e
@ -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
|
||||
|
@ -1,4 +0,0 @@
|
||||
url https://sourceforge.net/projects/asymptote/files/
|
||||
SF_version_dir
|
||||
version_link 'src[.]tgz/download$'
|
||||
SF_redirect
|
Loading…
Reference in New Issue
Block a user