Skip to content

Commit 41f1207

Browse files
authored
asymptote: 2.92 -> 2.95 (NixOS#372084)
2 parents aafd5e3 + 4dc0ebf commit 41f1207

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

pkgs/tools/graphics/asymptote/default.nix

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
boehmgc,
1919
libGLU,
2020
libGL,
21+
libglvnd,
2122
ncurses,
2223
readline,
2324
gsl,
2425
libsigsegv,
2526
python3,
2627
qtbase,
2728
qtsvg,
28-
boost,
29+
boost186,
2930
zlib,
3031
perl,
3132
curl,
@@ -35,7 +36,7 @@
3536
}:
3637

3738
stdenv.mkDerivation (finalAttrs: {
38-
version = "2.92";
39+
version = "2.95";
3940
pname = "asymptote";
4041

4142
outputs = [
@@ -48,9 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
4849

4950
src = fetchurl {
5051
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
51-
hash = "sha256-nZtcb6fg+848HlT+sl4tUdKMT+d5jyTHbNyugpGo6mY=";
52+
hash = "sha256-FWBP0Cy23bxbgHUp0ub8YXyCWhhN0Ne3E5DFZ66seOc=";
5253
};
5354

55+
# https://github.com/vectorgraphics/asymptote/issues/513
56+
postConfigure = ''
57+
substituteInPlace Makefile \
58+
--replace-fail 'glew.o -lGLX' 'glew.o'
59+
'';
60+
5461
# override with TeX Live containers to avoid building sty, docs from source
5562
texContainer = null;
5663
texdocContainer = null;
@@ -64,7 +71,17 @@ stdenv.mkDerivation (finalAttrs: {
6471
texinfo
6572
wrapQtAppsHook
6673
cmake
74+
ghostscriptX
75+
perl
6776
pkg-config
77+
(python3.withPackages (
78+
ps: with ps; [
79+
click
80+
cson
81+
numpy
82+
pyqt5
83+
]
84+
))
6885
]
6986
++ lib.optional (finalAttrs.texContainer == null || finalAttrs.texdocContainer == null) (
7087
texliveSmall.withPackages (
@@ -94,7 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
94111
curl
95112
qtbase
96113
qtsvg
97-
boost
114+
# relies on removed asio::io_service
115+
# https://github.com/kuafuwang/LspCpp/issues/52
116+
boost186
98117
(python3.withPackages (
99118
ps: with ps; [
100119
cson
@@ -112,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
112131
libglut
113132
libGLU
114133
libGL
134+
libglvnd
115135
]
116136
++ lib.optionals stdenv.hostPlatform.isDarwin (
117137
with darwin.apple_sdk.frameworks;
@@ -155,6 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
155175

156176
postInstall = ''
157177
rm "$out"/bin/xasy
178+
chmod +x "$out"/share/asymptote/GUI/xasy.py
158179
makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin
159180
160181
if [[ -z $texdocContainer ]] ; then
@@ -199,6 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
199220

200221
meta = with lib; {
201222
description = "Tool for programming graphics intended to replace Metapost";
223+
homepage = "https://asymptote.sourceforge.io/";
202224
license = licenses.gpl3Plus;
203225
maintainers = [ maintainers.raskin ];
204226
platforms = platforms.linux ++ platforms.darwin;

0 commit comments

Comments
 (0)