pyrox.dev
lol
gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
+29
-26
+1
-1
nixos/modules/services/x11/display-managers/lightdm.nix
+1
-1
nixos/modules/services/x11/display-managers/lightdm.nix
···
34
34
$out/greeter \
35
35
--prefix PATH : "${pkgs.glibc.bin}/bin" \
36
36
--set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
37
-
--set GTK_PATH "${theme}:${pkgs.gtk3}" \
37
+
--set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
38
38
--set GTK_EXE_PREFIX "${theme}" \
39
39
--set GTK_DATA_PREFIX "${theme}" \
40
40
--set XDG_DATA_DIRS "${theme}/share:${icons}/share" \
+1
-1
pkgs/applications/graphics/shotwell/default.nix
+1
-1
pkgs/applications/graphics/shotwell/default.nix
···
30
30
preFixup = ''
31
31
wrapProgram "$out/bin/shotwell" \
32
32
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
33
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
33
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
34
34
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
35
35
'';
36
36
+1
-1
pkgs/applications/misc/sweethome3d/default.nix
+1
-1
pkgs/applications/misc/sweethome3d/default.nix
···
31
31
cp install/${module}-${version}.jar $out/share/java/.
32
32
cp "${sweethome3dItem}/share/applications/"* $out/share/applications
33
33
makeWrapper ${jre}/bin/java $out/bin/$exec \
34
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
34
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
35
35
--add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
36
36
'';
37
37
+1
-1
pkgs/applications/misc/sweethome3d/editors.nix
+1
-1
pkgs/applications/misc/sweethome3d/editors.nix
···
40
40
cp ${module}-${version}.jar $out/share/java/.
41
41
cp "${editorItem}/share/applications/"* $out/share/applications
42
42
makeWrapper ${jre}/bin/java $out/bin/$exec \
43
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
43
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
44
44
--add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
45
45
'';
46
46
+2
-2
pkgs/applications/video/kazam/default.nix
+2
-2
pkgs/applications/video/kazam/default.nix
···
34
34
preFixup = ''
35
35
wrapProgram $out/bin/kazam \
36
36
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
37
-
--prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \
37
+
--prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \
38
38
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
39
-
--prefix XDG_DATA_DIRS : "${gtk3}/share" \
39
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share" \
40
40
--set GST_REGISTRY "/tmp/kazam.gstreamer.registry";
41
41
'';
42
42
+2
-2
pkgs/desktops/gnome-3/3.16/core/evince/default.nix
+2
-2
pkgs/desktops/gnome-3/3.16/core/evince/default.nix
···
27
27
"--enable-introspection"
28
28
];
29
29
30
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
30
+
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
31
31
32
32
preConfigure = with stdenv.lib;
33
33
optionalString doCheck ''
···
45
45
# by `g_file_info_get_content_type ()'.
46
46
wrapProgram "$out/bin/evince" \
47
47
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
48
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
48
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
49
49
50
50
'';
51
51
+1
-1
pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+1
-1
pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
···
24
24
preFixup = ''
25
25
wrapProgram "$out/bin/gnome-dictionary" \
26
26
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
27
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
27
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
28
28
'';
29
29
30
30
meta = with stdenv.lib; {
+2
-2
pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+2
-2
pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
···
12
12
13
13
doCheck = true;
14
14
15
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
15
+
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
16
16
17
17
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
18
18
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
···
23
23
preFixup = ''
24
24
wrapProgram "$out/bin/gnome-screenshot" \
25
25
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
26
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
26
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
27
27
'';
28
28
29
29
meta = with stdenv.lib; {
+2
-2
pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+2
-2
pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
···
12
12
13
13
doCheck = true;
14
14
15
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
15
+
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
16
16
17
17
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
18
18
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
···
23
23
preFixup = ''
24
24
wrapProgram "$out/bin/gnome-system-log" \
25
25
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
26
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
26
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
27
27
'';
28
28
29
29
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
+1
-1
pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
···
34
34
wrapProgram "$out/bin/gitg" \
35
35
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
36
36
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
37
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
37
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
38
38
'';
39
39
40
40
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+1
-1
pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
···
27
27
preFixup = ''
28
28
wrapProgram "$out/bin/gnome-tweak-tool" \
29
29
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
30
-
--suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
30
+
--suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
31
31
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
32
32
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
33
33
'';
+1
-1
pkgs/desktops/gnome-3/3.18/core/evince/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/core/evince/default.nix
···
40
40
# by `g_file_info_get_content_type ()'.
41
41
wrapProgram "$out/bin/evince" \
42
42
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
43
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
43
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
44
44
45
45
'';
46
46
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
···
19
19
preFixup = ''
20
20
wrapProgram "$out/bin/gnome-dictionary" \
21
21
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
22
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
22
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
23
23
'';
24
24
25
25
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
···
18
18
preFixup = ''
19
19
wrapProgram "$out/bin/gnome-screenshot" \
20
20
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
21
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
21
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
22
22
'';
23
23
24
24
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
···
23
23
preFixup = ''
24
24
wrapProgram "$out/bin/gnome-system-log" \
25
25
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
26
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
26
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
27
27
'';
28
28
29
29
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix
···
26
26
wrapProgram "$out/bin/gitg" \
27
27
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
28
28
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
29
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
29
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
30
30
'';
31
31
32
32
meta = with stdenv.lib; {
+1
-1
pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix
+1
-1
pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix
···
22
22
preFixup = ''
23
23
wrapProgram "$out/bin/gnome-tweak-tool" \
24
24
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
25
-
--suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
25
+
--suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
26
26
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
27
27
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
28
28
'';
+3
pkgs/development/libraries/gtk+/3.x.nix
+3
pkgs/development/libraries/gtk+/3.x.nix
+1
-1
pkgs/misc/cups/default.nix
+1
-1
pkgs/misc/cups/default.nix
···
16
16
sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
17
17
};
18
18
19
-
# FIXME: Split off the cups client library.
19
+
# FIXME: the cups libraries contains some $out/share strings so can't be split.
20
20
outputs = [ "dev" "out" "doc" "man" ];
21
21
22
22
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
+1
-1
pkgs/tools/inputmethods/ibus/default.nix
+1
-1
pkgs/tools/inputmethods/ibus/default.nix
···
28
28
for f in "$out"/bin/*; do
29
29
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
30
30
--prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
31
-
--prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
31
+
--prefix LD_LIBRARY_PATH : "${gnome3.gtk3.out}/lib:${atk.out}/lib:$out/lib" \
32
32
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
33
33
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
34
34
done
+2
-2
pkgs/tools/networking/gupnp-tools/default.nix
+2
-2
pkgs/tools/networking/gupnp-tools/default.nix
···
13
13
gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper];
14
14
15
15
postInstall = ''
16
-
wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
17
-
wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
16
+
wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
17
+
wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
18
18
'';
19
19
}
+1
-1
pkgs/top-level/python-packages.nix
+1
-1
pkgs/top-level/python-packages.nix