ssb-patchwork: fix GTK file selection dialog · Pull Request #83410 · NixOS/nixpkgs

ghost · 2020-03-26T07:16:26Z

Motivation for this change

Fix a bug with file selection dialogs.

Things done

ping @asymmetric

Fix #76743

asymmetric · 2020-03-26T15:18:07Z

Works like a charm! ❤️

worldofpeace · 2020-03-26T23:07:53Z

pkgs/applications/networking/ssb/patchwork/default.nix

-  symlinkJoin {
-    inherit name;
-    paths = [ binary ];
+in stdenvNoCC.mkDerivation {


I don't really get why we have to use the NoCC version here? It has little benefit.

worldofpeace · 2020-03-26T23:11:00Z

pkgs/applications/networking/ssb/patchwork/default.nix

+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  buildCommand = ''
+    makeWrapper "${binary}/bin/ssb-patchwork" "$out/bin/ssb-patchwork" \
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \


this is an improper use of wrapGAppsHook.
Please read https://nixos.org/nixpkgs/manual/#ssec-gnome-hooks, it exists so you don't have to do this.

It also should automatically wrap everything at $out/bin. If you make a symlink here for ${binary}/bin/ssb-patchwork $out/bin/ssb-patchwork you shouldn't have to do anything.

I would prefer an automatic solution but it doesn't work here.

Could you explain why? If you can't you can just use the makeWrapper with the arguments wrapGAppsHook collects "${gappsWrapperArgs[@]}".

worldofpeace · 2020-03-26T23:12:06Z

We could probably backport this bugfix to 20.03

flokli · 2020-03-27T09:04:31Z

This uses a buildFHSUserEnv under the hood - I'd expect things to just work out of the box inside one ot these, so wrapGappsHook or other custom wrapping shouldn't be necessary at all.

@jtojnar, @tilpner, could you take a look?

worldofpeace · 2020-03-27T18:03:09Z

This uses a buildFHSUserEnv under the hood - I'd expect things to just work out of the box inside one ot these, so wrapGappsHook or other custom wrapping shouldn't be necessary at all.

@jtojnar, @tilpner, could you take a look?

Gsettings-schemas are relocated in share/gsettings-schemas/${name}/glib-2.0, not the fhs location. I would obviously be very familiar with this 😕

tilpner · 2020-03-28T08:45:29Z

This uses a buildFHSUserEnv under the hood - I'd expect things to just work out of the box inside one ot these, so wrapGappsHook or other custom wrapping shouldn't be necessary at all.

@jtojnar, @tilpner, could you take a look?

I have little knowledge about how gsettings is supposed to work, and what this gschema.compiled is.
Here's how you can play with the FHS env interactively:

$ APPIMAGE_DEBUG_EXEC=bash /nix/store/md7rlyjkkzl84pimmwmh3qs986czs1rf-Patchwork-3.17.6/bin/ssb-patchwork
bash-4.4$ find -L /usr/share/gsettings-schemas
/usr/share/gsettings-schemas
/usr/share/gsettings-schemas/gtk+3-3.24.14
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Demo.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/gschemas.compiled
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
bash-4.4$ echo $XDG_DATA_DIRS
/home/tilpner/.nix-profile/share:/etc/profiles/per-user/tilpner/share:/nix/var/nix/profiles/default/share:/run/current-system/sw/share

It seems like a version of gschemas.compiled is installed, but buildFHSUserEnv might not set XDG_DATA_DIRS at all. If it's supposed to, you can try adding

profile = ''
  export XDG_DATA_DIRS=/usr/share/...
'';

to

nixpkgs/pkgs/build-support/appimage/default.nix

Lines 25 to 32 in afb035a

    
           wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { 
        
             inherit name; 
        
             targetPkgs = pkgs: [ appimage-exec ] 
        
               ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; 
        
             runScript = "appimage-exec.sh -w ${src}"; 
        
           } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));

worldofpeace · 2020-03-28T19:34:44Z

This uses a buildFHSUserEnv under the hood - I'd expect things to just work out of the box inside one ot these, so wrapGappsHook or other custom wrapping shouldn't be necessary at all.
@jtojnar, @tilpner, could you take a look?

I have little knowledge about how gsettings is supposed to work, and what this gschema.compiled is.
Here's how you can play with the FHS env interactively:
$ APPIMAGE_DEBUG_EXEC=bash /nix/store/md7rlyjkkzl84pimmwmh3qs986czs1rf-Patchwork-3.17.6/bin/ssb-patchwork
bash-4.4$ find -L /usr/share/gsettings-schemas
/usr/share/gsettings-schemas
/usr/share/gsettings-schemas/gtk+3-3.24.14
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Demo.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/gschemas.compiled
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
/usr/share/gsettings-schemas/gtk+3-3.24.14/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
bash-4.4$ echo $XDG_DATA_DIRS
/home/tilpner/.nix-profile/share:/etc/profiles/per-user/tilpner/share:/nix/var/nix/profiles/default/share:/run/current-system/sw/share
It seems like a version of gschemas.compiled is installed, but buildFHSUserEnv might not set XDG_DATA_DIRS at all. If it's supposed to, you can try adding
profile = ''
  export XDG_DATA_DIRS=/usr/share/...
'';
to

nixpkgs/pkgs/build-support/appimage/default.nix

Lines 25 to 32 in afb035a

wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {

inherit name;

targetPkgs = pkgs: [ appimage-exec ]

++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;

runScript = "appimage-exec.sh -w ${src}";

} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));

wrapGAppsHook will add the gsettings-schemas directories to XDG_DATA_DIRS via the glib setup-hook https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glib/setup-hook.sh#L2.
You've confirmed what I've said here, we don't install gsettings-schemas into their default location, so we have to use wrapGAppsHook to include the gsettings-schemas.

flokli · 2020-03-29T17:55:10Z

But didn't this PR state that simply adding wrapGAppsHook didn't work?

worldofpeace · 2020-03-29T18:07:33Z

But didn't this PR state that simply adding wrapGAppsHook didn't work?

wrapGAppsHook being added also just automatically wraps. Maybe manual wrapping is needed, but you still need wrapGAppsHook to collect gappsWrapperArgs.

picnoir · 2020-03-29T18:21:34Z

Stupid question from a GTK noob here: why do we need to wrap the binary to add these schema in the first place? The appimageTools.wrapType2 function we're using in this package is in charge of creating an FHS env containing among other things GTK3. Ain't this FHS environment supposed to provide the ${gtk3}/share/gsettings-schemas/* schemas? Why are we missing them there? Is there a particular reason why we rather should wrap this particular binary instead of adding these schemas directly in the appimageTools.wrapType2 function, thus making sure we won't end up facing the same issue in other appImage bindists?

worldofpeace · 2020-03-29T18:36:36Z

Stupid question from a GTK noob here: why do we need to wrap the binary to add these schema in the first place? The appimageTools.wrapType2 function we're using in this package is in charge of creating an FHS env containing among other things GTK3. Ain't this FHS environment supposed to provide the ${gtk3}/share/gsettings-schemas/* schemas? Why are we missing them there? Is there a particular reason why we rather should wrap this particular binary instead of adding these schemas directly in the appimageTools.wrapType2 function, thus making sure we won't end up facing the same issue in other appImage bindists?

As I've said, in nixos we have a setup-hook that relocates all settings schemas to share/gsettings-schemas/${name}/glib-2.0/schemas. The FHS location would have been usr/share/glib-2.0/schemas. We can fix this problem by having the FHS chrootenv install them in that location #83705. That PR should obsolete this.

picnoir · 2020-03-29T18:39:40Z

I just realized I forgot the obvious in my previous message: thanks a lot ehmry! This particular bug has been a personal pain for a while. My current workaround was to fire up patchwork from my shell environment, which was fixing this problem for a reason I failed to identify. Anyways, kudos!

ghost · 2020-03-30T12:02:44Z

While this patch may fix Patchwork in the short-time, I'm closing the PR in favor of the general fix, #83705.

Artturin · 2022-02-24T23:16:50Z

#161739

ssb-patchwork: fix GTK file selection dialog

36aec4d

Fix #76743

ofborg bot requested a review from picnoir March 26, 2020 07:22

ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 26, 2020

worldofpeace reviewed Mar 26, 2020

View reviewed changes

worldofpeace mentioned this pull request Mar 29, 2020

buildFHSChrootEnv: link gsettings-schemas to FHS location #83705

Closed

10 tasks

picnoir mentioned this pull request Nov 23, 2020

ssb-patchwork crashes when trying to change profile picture #76743

Open

This pull request was closed.

Uh oh!

Conversation

ghost commented Mar 26, 2020

Motivation for this change

Things done

Uh oh!

asymmetric commented Mar 26, 2020

Uh oh!

worldofpeace Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

worldofpeace Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

ghost Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

worldofpeace Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

worldofpeace commented Mar 26, 2020

Uh oh!

flokli commented Mar 27, 2020

Uh oh!

worldofpeace commented Mar 27, 2020

Uh oh!

tilpner commented Mar 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

worldofpeace commented Mar 28, 2020

Uh oh!

flokli commented Mar 29, 2020

Uh oh!

worldofpeace commented Mar 29, 2020

Uh oh!

picnoir commented Mar 29, 2020 via email

Uh oh!

worldofpeace commented Mar 29, 2020

Uh oh!

picnoir commented Mar 29, 2020 via email

Uh oh!

ghost commented Mar 30, 2020

Uh oh!

Artturin commented Feb 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

tilpner commented Mar 28, 2020 •

edited

Loading