pyrox.dev
eukleides: unbreak, switch to mirror
+28
-10
pkgs/by-name/eu/eukleides/package.nix
+28
-10
pkgs/by-name/eu/eukleides/package.nix
···
1
1
{
2
2
lib,
3
3
stdenv,
4
-
fetchurl,
4
+
fetchFromGitLab,
5
5
bison,
6
6
flex,
7
7
makeWrapper,
8
-
texinfo4,
9
8
getopt,
10
9
readline,
10
+
texinfo,
11
11
texlive,
12
+
versionCheckHook,
12
13
}:
13
14
14
15
stdenv.mkDerivation (finalAttrs: {
15
16
pname = "eukleides";
16
17
version = "1.5.4";
17
18
18
-
src = fetchurl {
19
-
url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2";
20
-
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
19
+
src = fetchFromGitLab {
20
+
# official upstream www.eukleides.org is down
21
+
domain = "salsa.debian.org";
22
+
owner = "georgesk";
23
+
repo = "eukleides";
24
+
rev = "upstream/${finalAttrs.version}";
25
+
hash = "sha256-keX7k14X/97zHh87A/7vUsfGc/S6fByd+rewW+LkJeM=";
21
26
};
22
27
23
28
patches = [
···
25
30
./use-CC.patch
26
31
# allow PostScript transparency in epstopdf call
27
32
./gs-allowpstransparency.patch
33
+
# fix curly brace escaping in eukleides.texi for newer texinfo compatiblity
34
+
./texinfo-escape.patch
28
35
];
29
36
30
37
nativeBuildInputs = [
31
38
bison
32
39
flex
33
-
texinfo4
40
+
texinfo
34
41
makeWrapper
35
42
];
36
43
···
41
48
42
49
preConfigure = ''
43
50
substituteInPlace Makefile \
44
-
--replace mktexlsr true
51
+
--replace-fail mktexlsr true
45
52
46
53
substituteInPlace doc/Makefile \
47
-
--replace ginstall-info install-info
54
+
--replace-fail ginstall-info install-info
48
55
49
56
substituteInPlace Config \
50
-
--replace '/usr/local' "$out" \
51
-
--replace '$(SHARE_DIR)/texmf' "$tex"
57
+
--replace-fail '/usr/local' "$out" \
58
+
--replace-fail '$(SHARE_DIR)/texmf' "$tex"
52
59
'';
53
60
54
61
# Workaround build failure on -fno-common toolchains like upstream
···
56
63
# ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A';
57
64
# eukleides_build/quadrilateral.o:(.bss+0x18): first defined here
58
65
env.NIX_CFLAGS_COMPILE = "-fcommon";
66
+
67
+
preBuild = ''
68
+
mkdir build/eukleides_build
69
+
mkdir build/euktopst_build
70
+
'';
71
+
72
+
enableParallelBuilding = true;
59
73
60
74
preInstall = ''
61
75
mkdir -p $out/bin
···
83
97
];
84
98
pkgs = [ finalAttrs.finalPackage.tex ];
85
99
};
100
+
101
+
doInstallCheck = true;
102
+
nativeInstallCheckInputs = [ versionCheckHook ];
103
+
versionCheckProgramArg = "--version";
86
104
87
105
meta = {
88
106
description = "Geometry Drawing Language";
+19
pkgs/by-name/eu/eukleides/texinfo-escape.patch
+19
pkgs/by-name/eu/eukleides/texinfo-escape.patch
···
1
+
--- a/doc/eukleides.texi
2
+
+++ b/doc/eukleides.texi
3
+
@@ -6,12 +6,12 @@
4
+
5
+
% ------------------------------------------------------------------------------
6
+
7
+
-\def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX}
8
+
-\def\mdeg{$^\circ$}
9
+
+\def\LaTeX@{L\kern-.34em\raise.49ex\hbox@{\sevenrm A@}\kern-.18em\TeX@}
10
+
+\def\mdeg@{$^\circ$@}
11
+
\font\degfont=cmtt8
12
+
-\def\deg{\raise.7ex\hbox{\degfont o}}
13
+
-\def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}}
14
+
-\def\exmp{\noindent{\textit Example:}}
15
+
+\def\deg@{\raise.7ex\hbox@{\degfont o@}@}
16
+
+\def\exm#1@{\noindent@{\textit Example:@}\quad@{\texttt #1@}@}
17
+
+\def\exmp@{\noindent@{\textit Example:@}@}
18
+
19
+
% ------------------------------------------------------------------------------