Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Nov 8, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 13 additions & 5 deletions pkgs/tools/graphics/asymptote/default.nix
View file
Open in desktop
@@ -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";
}))
;
Comment on lines +27 to +28
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting wrong.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean semicolon hanging so that more patches could if something comes up be added with cleaner diff?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it looks a bit strange but does not matter to much.


nativeBuildInputs = [
autoreconfHook
bison
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions pkgs/tools/graphics/asymptote/default.upstream
View file
Open in desktop

This file was deleted.