tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
Merge pull request #247844 from uninsane/pr-gtk-compile-schemasE
+15
-1
+6
-1
pkgs/development/libraries/gtk/3.x.nix
+6
-1
pkgs/development/libraries/gtk/3.x.nix
···
24
24
, gobject-introspection
25
25
, buildPackages
26
26
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
27
+
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
27
28
, fribidi
28
29
, xorg
29
30
, libepoxy
···
111
110
gtk-doc
112
111
# For xmllint
113
112
libxml2
114
-
] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
113
+
] ++ lib.optionals ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
115
114
mesonEmulatorHook
116
115
] ++ lib.optionals waylandSupport [
117
116
wayland-scanner
···
183
182
# See https://github.com/NixOS/nixpkgs/issues/132259
184
183
substituteInPlace meson.build \
185
184
--replace "x11_enabled = false" ""
185
+
186
+
# this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled.
187
+
substituteInPlace meson.build \
188
+
--replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}'
186
189
187
190
files=(
188
191
build-aux/meson/post-install.py
+9
pkgs/development/libraries/gtk/4.x.nix
+9
pkgs/development/libraries/gtk/4.x.nix
···
1
1
{ lib
2
2
, stdenv
3
+
, buildPackages
3
4
, substituteAll
4
5
, fetchurl
5
6
, pkg-config
···
8
7
, graphene
9
8
, gi-docgen
10
9
, meson
10
+
, mesonEmulatorHook
11
11
, ninja
12
12
, python3
13
13
, makeWrapper
···
47
45
, wayland-scanner
48
46
, xineramaSupport ? stdenv.isLinux
49
47
, cupsSupport ? stdenv.isLinux
48
+
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
50
49
, cups
51
50
, AppKit
52
51
, Cocoa
···
102
99
sassc
103
100
gi-docgen
104
101
libxml2 # for xmllint
102
+
] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
103
+
mesonEmulatorHook
105
104
] ++ lib.optionals waylandSupport [
106
105
wayland-scanner
107
106
] ++ setupHooks;
···
195
190
};
196
191
197
192
postPatch = ''
193
+
# this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled.
194
+
substituteInPlace meson.build \
195
+
--replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}'
196
+
198
197
files=(
199
198
build-aux/meson/gen-demo-header.py
200
199
demos/gtk-demo/geninclude.py