pyrox.dev
Merge pull request #258527 from kirillrdy/dia
dia: unstable-2022-12-14 -> unstable-2023-09-28
authored by Weijia Wang and committed by GitHub 4c969d69 f902cb49
+8
-11
pkgs/applications/graphics/dia/default.nix
+8
-11
pkgs/applications/graphics/dia/default.nix
···
2
2
, stdenv
3
3
, fetchFromGitLab
4
4
, appstream-glib
5
-
, cmake
6
5
, dblatex
7
6
, desktop-file-utils
8
7
, graphene
9
-
, gtk2
10
-
, gtk-mac-integration-gtk2
8
+
, gtk3
9
+
, gtk-mac-integration-gtk3
11
10
, intltool
12
11
, libxml2
13
12
, libxslt
···
16
15
, pkg-config
17
16
, poppler
18
17
, python3
19
-
# Building with docs are failing in unstable-2022-12-14
18
+
# Building with docs are still failing in unstable-2023-09-28
20
19
, withDocs ? false
21
20
}:
22
21
23
22
stdenv.mkDerivation {
24
23
pname = "dia";
25
-
version = "unstable-2022-12-14";
24
+
version = "unstable-2023-09-28";
26
25
27
26
src = fetchFromGitLab {
28
27
owner = "GNOME";
29
28
repo = "dia";
30
29
domain = "gitlab.gnome.org";
31
-
rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad";
32
-
hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww=";
30
+
rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322";
31
+
hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q=";
33
32
};
34
-
35
-
patches = [ ./poppler-22_09-build-fix.patch ];
36
33
37
34
# Required for the PDF plugin when building with clang.
38
35
CXXFLAGS = "-std=c++17";
···
43
40
44
41
buildInputs = [
45
42
graphene
46
-
gtk2
43
+
gtk3
47
44
libxml2
48
45
python3
49
46
poppler
···
52
49
libxslt
53
50
] ++
54
51
lib.optionals stdenv.isDarwin [
55
-
gtk-mac-integration-gtk2
52
+
gtk-mac-integration-gtk3
56
53
];
57
54
58
55
nativeBuildInputs = [