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