tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
scribusUnstable: Fix build with Poppler 0.84
see: https://github.com/NixOS/nixpkgs/pull/77186#issuecomment-583800213
it seems poppler updates (almost?) always break scribusUnstable
additionally:
formatted with nixpkgs-fmt;
added kiwi to maintainers - the more eyes the better;
add additional licenses that are listed on scribus COPYING;
+93
-23
+92
-22
pkgs/applications/office/scribus/unstable.nix
+92
-22
pkgs/applications/office/scribus/unstable.nix
···
1
-
{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
2
-
boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
3
-
podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
1
+
{ boost
2
+
, cairo
3
+
, cmake
4
+
, cups
5
+
, fetchpatch
6
+
, fetchurl
7
+
, fontconfig
8
+
, freetype
9
+
, harfbuzzFull
10
+
, hunspell
11
+
, lcms2
12
+
, libjpeg
13
+
, libtiff
14
+
, libxml2
15
+
, mkDerivation
16
+
, pixman
17
+
, pkgconfig
18
+
, podofo
19
+
, poppler
20
+
, poppler_data
21
+
, python2
22
+
, qtbase
23
+
, qtimageformats
24
+
, qttools
25
+
, stdenv
26
+
}:
4
27
5
28
let
6
-
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
29
+
pythonEnv = python2.withPackages (
30
+
ps: [
31
+
ps.pillow
32
+
ps.tkinter
33
+
]
34
+
);
7
35
in
8
36
mkDerivation rec {
9
37
pname = "scribus";
38
+
10
39
version = "1.5.5";
11
40
12
41
src = fetchurl {
···
45
16
46
17
patches = [
47
18
# fix build with Poppler 0.82
48
-
(fetchpatch {
49
-
url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
50
-
sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
51
-
})
19
+
(
20
+
fetchpatch {
21
+
url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
22
+
sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
23
+
}
24
+
)
52
25
# fix build with Poppler 0.83
53
-
(fetchpatch {
54
-
url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
55
-
sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
56
-
})
26
+
(
27
+
fetchpatch {
28
+
url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
29
+
sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
30
+
}
31
+
)
32
+
# fix build with Poppler 0.84
33
+
# TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
34
+
(
35
+
fetchpatch {
36
+
url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
37
+
sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
38
+
}
39
+
)
57
40
];
58
41
59
42
enableParallelBuilding = true;
60
43
61
-
nativeBuildInputs = [ pkgconfig cmake ];
62
-
buildInputs = [
63
-
qtbase cairo pixman boost cups fontconfig
64
-
freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler
65
-
poppler_data pythonEnv qtimageformats qttools harfbuzzFull
44
+
nativeBuildInputs = [
45
+
cmake
46
+
pkgconfig
66
47
];
67
48
68
-
meta = {
69
-
maintainers = [ stdenv.lib.maintainers.erictapen ];
70
-
platforms = stdenv.lib.platforms.linux;
49
+
buildInputs = [
50
+
boost
51
+
cairo
52
+
cups
53
+
fontconfig
54
+
freetype
55
+
harfbuzzFull
56
+
hunspell
57
+
lcms2
58
+
libjpeg
59
+
libtiff
60
+
libxml2
61
+
pixman
62
+
podofo
63
+
poppler
64
+
poppler_data
65
+
pythonEnv
66
+
qtbase
67
+
qtimageformats
68
+
qttools
69
+
];
70
+
71
+
meta = with stdenv.lib; {
72
+
maintainers = with maintainers; [
73
+
erictapen
74
+
kiwi
75
+
];
76
+
platforms = platforms.linux;
71
77
description = "Desktop Publishing (DTP) and Layout program for Linux";
72
-
homepage = http://www.scribus.net;
73
-
license = stdenv.lib.licenses.gpl2;
78
+
homepage = "http://www.scribus.net";
79
+
# There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
80
+
license = with licenses; [
81
+
bsd3
82
+
gpl2
83
+
mit
84
+
publicDomain
85
+
];
74
86
};
75
87
}
+1
-1
pkgs/development/libraries/poppler/default.nix
+1
-1
pkgs/development/libraries/poppler/default.nix
···
12
12
in
13
13
stdenv.mkDerivation rec {
14
14
name = "poppler-${suffix}-${version}";
15
-
version = "0.84.0"; # beware: updates often break cups-filters build, check texlive too!
15
+
version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
16
16
17
17
src = fetchurl {
18
18
url = "${meta.homepage}/poppler-${version}.tar.xz";