gtk3: make GTK depend on gsettings_desktop_schemas #31891

ghost · 2017-11-21T11:51:45Z

Motivation for this change

So dconf settings will be applied to GTK3 programs even if running outside of Gnome. See #31293

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

ghost · 2017-11-21T11:53:05Z

/cc @jtojnar

jtojnar · 2017-11-21T11:56:09Z

pkgs/applications/office/libreoffice/default.nix

@@ -168,7 +168,7 @@ in stdenv.mkDerivation rec {
      ln -s $out/lib/libreoffice/program/$a $out/bin/$a
      wrapProgram "$out/bin/$a" \
         --prefix XDG_DATA_DIRS : \
-         "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+         "$out/share" \


This is already part of wrapGAppsHook:

nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh

Lines 29 to 31 in 7374650

if [ -d "$prefix/share" ]; then

gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")

fi

jtojnar · 2017-11-21T11:58:47Z

pkgs/applications/networking/p2p/transmission/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ intltool file openssl curl libevent zlib ]
-    ++ optionals enableGTK3 [ gtk3 makeWrapper ]
+    ++ optionals enableGTK3 [ gtk3 wrapGAppsHook ]


Preferably, the hook would be added to nativeBuildInputs.

jtojnar

Can confirm gsettings_desktop_schemas are correctly picked up by GTK in Transmission in Sway.

I also considered adding hicolor_icon_theme as a hook dependency but since it is probably only needed by apps with CSD, file chooser dialogue or similar advanced constructs, it is probably wiser to add it to the respective applications’ dependencies.

jtojnar · 2017-11-21T13:32:49Z

Could you please squash the third commit into the first one and add some description to the second one (at least the issue link)?

ghost · 2017-11-21T13:39:21Z

@jtojnar Done, thank you!

gebner · 2017-11-21T14:17:37Z

We should probably clean up the now-superfluous gsettings_desktop_schemas in various packages like dconf-editor.

jtojnar · 2017-11-21T16:00:20Z

Actually, would it make sense to make GTK rather than the hook depend on the schemas?

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index fe6d37ec692..40231edf40e 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -4,7 +4,7 @@
 , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
-, darwin
+, darwin, gnome3
 }:
 
 assert cupsSupport -> cups != null;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./3.0-immodules.cache.patch ];
 
-  buildInputs = [ libxkbcommon epoxy json_glib ];
+  buildInputs = [ libxkbcommon epoxy json_glib gnome3.gsettings_desktop_schemas ];
   propagatedBuildInputs = with xorg; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
       libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08f04faf041..23a9bb27fe0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -346,7 +346,7 @@ with pkgs;
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
   wrapGAppsHook = makeSetupHook {
-    deps = [ gnome3.dconf.lib gnome3.gtk gnome3.gsettings_desktop_schemas librsvg makeWrapper ];
+    deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ];
   } ../build-support/setup-hooks/wrap-gapps-hook.sh;
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;

jtojnar · 2017-11-21T22:24:18Z

/cc GTK maintainers @raskin, @vcunat, @lethalman

ghost · 2017-11-22T12:03:04Z

@jtojnar With your patch dconf settings are not applied to e.g. transmission when testing this way:

cd nixpkgs
nix-build -A transmission_gtk
./result/bin/transmission-gtk

Am I missing anything?

jtojnar · 2017-11-22T13:12:01Z

Sorry, should have added it to propagatedBuildInputs for glib envHook to run.

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index fe6d37ec692..57366bc3582 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -4,7 +4,7 @@
 , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
-, darwin
+, darwin, gnome3
 }:
 
 assert cupsSupport -> cups != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxkbcommon epoxy json_glib ];
   propagatedBuildInputs = with xorg; with stdenv.lib;
-    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas
       libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
     ++ optionals waylandSupport [ wayland wayland-protocols ]
     ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08f04faf041..23a9bb27fe0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -346,7 +346,7 @@ with pkgs;
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
   wrapGAppsHook = makeSetupHook {
-    deps = [ gnome3.dconf.lib gnome3.gtk gnome3.gsettings_desktop_schemas librsvg makeWrapper ];
+    deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ];
   } ../build-support/setup-hooks/wrap-gapps-hook.sh;
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;

ghost · 2017-11-22T13:47:58Z

@jtojnar This one works, thank you!

jtojnar · 2017-11-23T21:44:03Z

@gnidorah could you update it then, we got okayed by @vcunat on IRC.

ghost · 2017-11-24T06:46:30Z

@jtojnar Done, thanks!

So dconf settings will be applied to GTK3 programs even if running outside of Gnome. See #31293

orivej · 2017-11-26T07:01:03Z

Why do you propagate this dependency from GTK and not from some Gnome package? (glib?) AFAIK GTK applications can not use GSettings without compiling with it.

orivej · 2017-11-26T07:32:39Z

Oh, I was confused, gsettings is an inherent part of libgio, which is one of glib libraries, which is an inherent dependency of GTK. I'll have to study GTK on NixOS more to be able to review such changes.

jtojnar · 2017-11-26T13:23:30Z

@orivej As described in the issue, GSettings is required when running on Wayland. We could apply the patch from the upstream bug but it would still not work while applications depend on dconf – we would also need to fix #11239 – and it still would not work for applications inherently require dconf (i.e. most gnome apps).

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Nov 21, 2017

jtojnar requested changes Nov 21, 2017

View reviewed changes

jtojnar approved these changes Nov 21, 2017

View reviewed changes

jtojnar added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Nov 23, 2017

jtojnar mentioned this pull request Nov 23, 2017

gnome3.gsettings_desktop_schemas: do not depend on gnome-backgrounds #31991

Merged

8 tasks

gtk3: make GTK depend on gsettings_desktop_schemas

8e03cda

So dconf settings will be applied to GTK3 programs even if running outside of Gnome. See #31293

ghost changed the title ~~wrapGAppsHook: add gsettings_desktop_schemas to dependencies~~ gtk3: make GTK depend on gsettings_desktop_schemas Nov 24, 2017

GrahamcOfBorg added 10.rebuild-linux: 501+ and removed 10.rebuild-linux: 101-500 labels Nov 24, 2017

vcunat changed the base branch from master to staging November 27, 2017 12:56

vcunat self-assigned this Nov 27, 2017

vcunat merged commit 8e03cda into NixOS:staging Nov 27, 2017

vcunat added a commit that referenced this pull request Nov 27, 2017

Merge #31891: gtk3: propagate gsettings_desktop_schemas

f71dfab

ghost deleted the gapps branch November 27, 2017 15:41

ghost mentioned this pull request Nov 30, 2017

wrapGAppsHook: use it for some more packages #32210

Merged

8 tasks

jtojnar mentioned this pull request Dec 18, 2017

solvespace2x: init at 2.x #32651

Closed

8 tasks

jtojnar mentioned this pull request Jan 13, 2018

Firefox: do not crash on print dialog. #30242

Closed

jtojnar mentioned this pull request Feb 1, 2018

gnome-power-manager: init at 3.26.0 #34480

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gtk3: make GTK depend on gsettings_desktop_schemas #31891

gtk3: make GTK depend on gsettings_desktop_schemas #31891

ghost commented Nov 21, 2017

ghost commented Nov 21, 2017

jtojnar Nov 21, 2017 •

edited

Loading

jtojnar Nov 21, 2017

jtojnar left a comment •

edited

Loading

jtojnar commented Nov 21, 2017

ghost commented Nov 21, 2017

gebner commented Nov 21, 2017

jtojnar commented Nov 21, 2017 •

edited

Loading

jtojnar commented Nov 21, 2017

ghost commented Nov 22, 2017 •

edited by ghost

Loading

jtojnar commented Nov 22, 2017

ghost commented Nov 22, 2017

jtojnar commented Nov 23, 2017 •

edited

Loading

ghost commented Nov 24, 2017

orivej commented Nov 26, 2017

orivej commented Nov 26, 2017

jtojnar commented Nov 26, 2017

	if [ -d "$prefix/share" ]; then
	gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
	fi

gtk3: make GTK depend on gsettings_desktop_schemas #31891

gtk3: make GTK depend on gsettings_desktop_schemas #31891

Conversation

ghost commented Nov 21, 2017

Motivation for this change

Things done

ghost commented Nov 21, 2017

jtojnar Nov 21, 2017 • edited Loading

Choose a reason for hiding this comment

jtojnar Nov 21, 2017

Choose a reason for hiding this comment

jtojnar left a comment • edited Loading

Choose a reason for hiding this comment

jtojnar commented Nov 21, 2017

ghost commented Nov 21, 2017

gebner commented Nov 21, 2017

jtojnar commented Nov 21, 2017 • edited Loading

jtojnar commented Nov 21, 2017

ghost commented Nov 22, 2017 • edited by ghost Loading

jtojnar commented Nov 22, 2017

ghost commented Nov 22, 2017

jtojnar commented Nov 23, 2017 • edited Loading

ghost commented Nov 24, 2017

orivej commented Nov 26, 2017

orivej commented Nov 26, 2017

jtojnar commented Nov 26, 2017

jtojnar Nov 21, 2017 •

edited

Loading

jtojnar left a comment •

edited

Loading

jtojnar commented Nov 21, 2017 •

edited

Loading

ghost commented Nov 22, 2017 •

edited by ghost

Loading

jtojnar commented Nov 23, 2017 •

edited

Loading