pyrox.dev
Merge pull request #278375 from arthsmn/scribus-update
scribus: 1.5.8 -> 1.6.0
+14
-48
pkgs/applications/office/scribus/default.nix
+14
-48
pkgs/applications/office/scribus/default.nix
···
3
3
, cmake
4
4
, cups
5
5
, fetchurl
6
-
, fetchpatch
7
6
, fontconfig
8
7
, freetype
9
8
, harfbuzzFull
···
12
11
, libjpeg
13
12
, libtiff
14
13
, libxml2
15
-
, mkDerivation
16
14
, pixman
17
15
, pkg-config
18
16
, podofo
19
17
, poppler
20
18
, poppler_data
21
19
, python3
22
-
, qtbase
23
-
, qtimageformats
24
-
, qttools
25
20
, lib
21
+
, stdenv
22
+
, qt5
26
23
}:
27
24
28
25
let
···
33
30
]
34
31
);
35
32
in
36
-
mkDerivation rec {
33
+
stdenv.mkDerivation (finalAttrs: {
37
34
pname = "scribus";
38
35
39
-
version = "1.5.8";
36
+
version = "1.6.0";
40
37
41
38
src = fetchurl {
42
-
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
43
-
hash = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q=";
39
+
url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz";
40
+
hash = "sha256-lLl0kOzhcoaNxPBMeqLulQtBtfL/QoXfN9YV8ETQOOU=";
44
41
};
45
42
46
-
patches = [
47
-
# For Poppler 22.02
48
-
(fetchpatch {
49
-
url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
50
-
sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
51
-
})
52
-
(fetchpatch {
53
-
url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
54
-
sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
55
-
})
56
-
# For Poppler 22.03
57
-
(fetchpatch {
58
-
url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
59
-
sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
60
-
})
61
-
# For Poppler 22.04
62
-
(fetchpatch {
63
-
url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
64
-
sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
65
-
})
66
-
# For Poppler 22.09
67
-
(fetchpatch {
68
-
url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch";
69
-
sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM=";
70
-
})
71
-
];
72
-
73
43
nativeBuildInputs = [
74
44
cmake
75
45
pkg-config
46
+
qt5.wrapQtAppsHook
76
47
];
77
48
78
49
buildInputs = [
···
92
63
poppler
93
64
poppler_data
94
65
pythonEnv
95
-
qtbase
96
-
qtimageformats
97
-
qttools
98
-
];
99
-
100
-
cmakeFlags = [
101
-
# poppler uses std::optional
102
-
"-DWANT_CPP17=ON"
66
+
qt5.qtbase
67
+
qt5.qtimageformats
68
+
qt5.qttools
103
69
];
104
70
105
71
meta = with lib; {
106
72
maintainers = with maintainers; [
107
-
erictapen
108
73
kiwi
74
+
arthsmn
109
75
];
110
-
platforms = platforms.linux;
111
-
description = "Desktop Publishing (DTP) and Layout program for Linux";
76
+
description = "Desktop Publishing (DTP) and Layout program";
112
77
homepage = "https://www.scribus.net";
113
78
# There are a lot of licenses...
114
79
# https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
···
118
83
mit
119
84
publicDomain
120
85
];
86
+
broken = stdenv.isDarwin;
121
87
};
122
-
}
88
+
})