tjh.dev
gdk-pixbuf: enable strictDeps
gdk-pixbuf: make gobject-introspection conditional to fix binfmt cross-compile
+15
-4
pkgs/development/libraries/gdk-pixbuf/default.nix
+15
-4
pkgs/development/libraries/gdk-pixbuf/default.nix
···
16
16
, libjpeg
17
17
, libpng
18
18
, gnome
19
-
, gobject-introspection
20
19
, doCheck ? false
21
20
, makeWrapper
22
21
, lib
22
+
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
23
+
, gobject-introspection
23
24
}:
24
25
25
26
let
···
41
42
patches = [
42
43
# Move installed tests to a separate output
43
44
./installed-tests-path.patch
45
+
];
46
+
47
+
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
48
+
strictDeps = true;
49
+
50
+
depsBuildBuild = [
51
+
pkg-config
44
52
];
45
53
46
54
nativeBuildInputs = [
···
49
57
pkg-config
50
58
gettext
51
59
python3
52
-
gobject-introspection
53
60
makeWrapper
54
61
glib
55
62
gi-docgen
···
58
65
libxslt
59
66
docbook-xsl-nons
60
67
docbook_xml_dtd_43
61
-
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
68
+
] ++ lib.optionals stdenv.isDarwin [
69
+
fixDarwinDylibNames
70
+
] ++ lib.optionals withIntrospection [
71
+
gobject-introspection
72
+
];
62
73
63
74
propagatedBuildInputs = [
64
75
glib
···
69
80
70
81
mesonFlags = [
71
82
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
72
-
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
83
+
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
73
84
"-Dgio_sniffing=false"
74
85
];
75
86