nixos/gnome3: add GNOME Flashback sessions option #53695

chpatrick · 2019-01-09T10:28:24Z

Motivation for this change

This allows you to enable GNOME Flashback sessions with a custom window manager.

Things done

chpatrick · 2019-01-09T10:29:26Z

I'm not totally sure about the organization. Maybe gnome-flashback-session should be in gnome-flashback's passthru?

pkgs/desktops/gnome-3/misc/gnome-flashback-session/default.nix

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix

chpatrick · 2019-01-09T20:33:19Z

Done, please take a look

jtojnar · 2019-01-09T23:21:24Z

pkgs/desktops/gnome-3/misc/gnome-flashback-session/default.nix

+      export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"
+    fi
+
+    exec ${gnome3.gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@"


Maybe add an option for extra arguments like the acceleration disablement.

It works for me without it and it's not a documented gnome-session flag so I think we should add it if someone needs it.

Here is a (commit adding this flag](https://gitlab.gnome.org/GNOME/gnome-flashback/commit/39dbfd09d4a7e16d5ca41319a62f173b8c79ca79) and a relevant bug.

pkgs/desktops/gnome-3/default.nix

nixos/modules/services/x11/desktop-managers/gnome3.nix

chpatrick · 2019-01-11T18:57:24Z

Hmm on my desktop it doesn't work yet because /nix/store/gnome-panel-.../share/applications isn't in some PATH. Do you know where I should add it?

jtojnar · 2019-01-11T19:04:00Z

That should go to XDG_DATA_DIRS and that is what wrapGAppsHook with

  preFixup = ''
    gappsWrapperArgs+=(
      # Session file requirements (for finding desktop files)
      --prefix XDG_DATA_DIRS : "${gnome-panel}/share"
    )
  '';

would do. But that is pretty pointless use of wrapGAppsHook.

I suggest that you just add the XDG_DATA_DIRS for the required desktop files into the session script like in the initial gist, and move wrapGAppsHook to the gnome-flashback package for finding the GSettings schemas.

chpatrick · 2019-01-11T19:24:56Z

OK, please take a look.

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix

jtojnar · 2019-01-11T19:35:04Z

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix

+        cat << EOF > $out/libexec/gnome-flashback-${wmName}
+        #!${bash}/bin/sh
+
+        if [ -z \$XDG_CURRENT_DESKTOP ]; then


Using lib.writeScript would allow us to avoid the need to escape this.

How would we put $out into it with writeScript?

It produces output which can be copied or linked.

I know but we want to add $out/share into XDG_DATA_DIRS, but we can't use $out in a writeScript.

let sessionScript = lib.writeScript ...; in stdenv.mkDerivation { buildCommand = '' … mkdir -p $out/libexec cp ${sessionScript} $out/libexec/gnome-flashback-${wmName} … ''; }

Again, I understand that. The question is how you would do the following in the writeScript given that $out is not available:

export XDG_DATA_DIRS=$out/share:...

Hmm, sorry, you are right. I was thinking about passing a placeholder but those do not really work with writeScript, I think.

chpatrick · 2019-01-13T22:55:50Z

I got it working with writeScript and co. I also needed to make some .desktop Execs absolute for it to work properly. Please take a look.

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix

hedning

Looks fine to me.

jtojnar · 2019-01-19T01:41:35Z

I tried running

{ pkgs, config, ... }: {
  services.xserver = {
    displayManager.gdm = {
      enable = true;
      debug = true;
    };
    desktopManager.gnome3 = {
      enable = true;
      debug = true;
      flashback.enableMetacity = true;
    };
  };
}

in a VM and found two issues:

The Applications menu is empty. We probably need either

environment.systemPackages = [ pkgs.gnome3.gnome-menus ];
environment.pathsToLink = [ "/share/desktop-directories" ];

or better yet

  preFixup = ''
    gappsWrapperArgs+=(
      --prefix XDG_DATA_DIRS : "${gnome-menus}/share"
    )
  '';

in gnome-panel

I cannot lock the screen:

Jan 19 01:00:48 nixos .gnome-panel-wr[1180]: Could not ask screensaver to lock: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.ScreenSaver was not provided by any .service files

Packaging gnome-screensaver and adding it to dbus.packages will be needed to support this.

jtojnar · 2019-01-19T01:50:00Z

It also might be nice to be enable gnome-flashback without gnome-shell. Maybe we could move most of the gnome3.nix to gnome-common.nix and then have gnome3.nix and gnome-flashback only containing enable and their own specific flags in, along with imports = [ ./gnome-common.nix ];.

jtojnar · 2019-01-19T09:47:19Z

  preFixup = ''
    gappsWrapperArgs+=(
      --prefix XDG_DATA_DIRS : "${gnome-menus}/share:${gnome-flashback}/share"
      --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg:${gnome-flashback}/etc/xdg"
    )
  '';

seems to fix it.

chpatrick · 2019-01-20T21:58:18Z

I'm working on packaging gnome-screensaver. While I do that, what do you think about opinionatedly replacing gnome-screensaver with xscreensaver? gnome-screensaver is deprecated and seems to need a lot of patches to get it to work properly (at least on Ubuntu). This shows how it's possible to do it.

chpatrick · 2019-01-20T22:18:59Z

OK I got it working with gnome-screensaver and also fixed the panel. Please take a look.

jtojnar · 2019-01-21T03:12:56Z

pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch

+ # Find out where the session service file goes
+ # The sad sed hack is recomended by section 27.10 of the automake manual.
+-DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'`
+DBUS_SESSION_SERVICE_DIR=${datarootdir}/dbus-1/services


You can use PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; in the expression.

I don't understand what that's for, I want to set the path directly instead of using the sed hack.

The sed hack will not do anything on Nix, as we do not use /usr/share prefix. Instead, we can override the path returned by pkg-config --variable session_bus_services_dir dbus-1 using the aforementioned environment variable, avoiding the need to patch the configure script.

The pkgconfig + sed hack is introduced by the Ubuntu patch that adds the dbus service. As you said it doesn't work, so I just replace it with the correct path directly. I don't see why changing what pkg-config returns would help.

I don't understand why pkg-config needs to be involved at all. This is the original patch:

https://git.launchpad.net/ubuntu/+source/gnome-screensaver/tree/debian/patches/05_dbus_service.patch?h=ubuntu/cosmic#n12

Well, the sed will not bother us with the environment variable set:

$ env PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR='${placeholder "out"}/share/dbus-1/services' pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g' ${placeholder "out"}/share/dbus-1/services

OK, in that case isn't it best to patch in the correct solution you described? I've pushed that now.

That would work too, though I would prefer to minimize the number of patches. It is messy enough as is, and there are much more patches than other distros have:

https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/gnome-screensaver
https://salsa.debian.org/gnome-team/gnome-screensaver/tree/debian/master/debian/patches

I guess we might want to switch to Arch’s patchset, as it is much closer to our philosophy. With Ubuntu, it is hard to tell which patches are Ubuntu specific, only needed due to patches of some other component (24 looks like that).

24 is also in the Arch patches: https://git.archlinux.org/svntogit/community.git/tree/trunk/use-screensaver-background.patch?h=packages/gnome-screensaver

The enabled Ubuntu patches all seem to be bugfixes not present in the other distros, I think it would be a good idea to have them. I think if we want to really get it right we should support xscreensaver since this package is old and deprecated, but let's do that in another PR.

pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix

jtojnar · 2019-01-21T03:53:18Z

Creating a DBus interface for xscreensaver could work, though maybe we would need to implement the other methods too.

chpatrick · 2019-01-21T09:23:40Z

Let's just do what upstream does with gnome-screensaver for now and merge this if possible. We can make another PR to add xscreensaver support.

jtojnar · 2019-01-21T10:12:00Z

By the way, do we care about running Flashback without having GNOME Shell installed?

chpatrick · 2019-01-21T10:27:38Z

By the way, do we care about running Flashback without having GNOME Shell installed?

I guess it could be useful, but I'd like to merge this first since it works now and separating the two would be quite a big change. If there's demand for it we can make another PR.

jtojnar · 2019-01-21T11:01:26Z

Works for me, thanks for your work.

chpatrick requested a review from infinisil as a code owner January 9, 2019 10:28

chpatrick mentioned this pull request Jan 9, 2019

Add GNOME Flashback support #47451

Closed

chpatrick force-pushed the gnome-flashback-session branch from 9fc5304 to 6d66fb1 Compare January 9, 2019 10:31

jtojnar reviewed Jan 9, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-flashback-session/default.nix Outdated Show resolved Hide resolved

jtojnar reviewed Jan 9, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix Outdated Show resolved Hide resolved

jtojnar requested a review from hedning January 9, 2019 17:36

chpatrick force-pushed the gnome-flashback-session branch 2 times, most recently from e26a011 to 4842da7 Compare January 9, 2019 20:30

jtojnar reviewed Jan 9, 2019

View reviewed changes

pkgs/desktops/gnome-3/default.nix Outdated Show resolved Hide resolved

chpatrick force-pushed the gnome-flashback-session branch from 4842da7 to 6f18572 Compare January 10, 2019 19:20

jtojnar reviewed Jan 10, 2019

View reviewed changes

nixos/modules/services/x11/desktop-managers/gnome3.nix Show resolved Hide resolved

chpatrick force-pushed the gnome-flashback-session branch from 6f18572 to f25a7c0 Compare January 11, 2019 19:23

jtojnar reviewed Jan 11, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix Outdated Show resolved Hide resolved

chpatrick force-pushed the gnome-flashback-session branch from f25a7c0 to 1552624 Compare January 11, 2019 19:32

jtojnar reviewed Jan 11, 2019

View reviewed changes

chpatrick force-pushed the gnome-flashback-session branch from 1552624 to f143ca7 Compare January 13, 2019 22:52

chpatrick force-pushed the gnome-flashback-session branch from f143ca7 to 869245c Compare January 14, 2019 14:23

GrahamcOfBorg added the 10.rebuild-linux: 11-100 label Jan 14, 2019

GrahamcOfBorg removed the 10.rebuild-linux: 1-10 label Jan 14, 2019

hedning reviewed Jan 17, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix Outdated Show resolved Hide resolved

hedning approved these changes Jan 18, 2019

View reviewed changes

chpatrick force-pushed the gnome-flashback-session branch from 869245c to 8759716 Compare January 20, 2019 22:18

GrahamcOfBorg added the 8.has: package (new) This PR adds a new package label Jan 20, 2019

GrahamcOfBorg requested review from jtojnar and hedning January 20, 2019 22:33

jtojnar reviewed Jan 21, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix Show resolved Hide resolved

jtojnar reviewed Jan 21, 2019

View reviewed changes

pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix Outdated Show resolved Hide resolved

chpatrick force-pushed the gnome-flashback-session branch from 8759716 to c5cd572 Compare January 21, 2019 09:22

chpatrick force-pushed the gnome-flashback-session branch from c5cd572 to cca2643 Compare January 21, 2019 09:34

GrahamcOfBorg requested a review from jtojnar January 21, 2019 09:35

nixos/gnome3: add GNOME Flashback sessions option

b25095b

chpatrick force-pushed the gnome-flashback-session branch from cca2643 to b25095b Compare January 21, 2019 10:18

jtojnar merged commit dd3626c into NixOS:master Jan 21, 2019

bobby285271 mentioned this pull request May 27, 2023

gnome-flashback: fix screenshot key and screen not locking when idle #233920

Merged

12 tasks

nixos/gnome3: add GNOME Flashback sessions option #53695

nixos/gnome3: add GNOME Flashback sessions option #53695

Conversation

chpatrick commented Jan 9, 2019

Motivation for this change

Things done

chpatrick commented Jan 9, 2019

chpatrick commented Jan 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chpatrick commented Jan 11, 2019

jtojnar commented Jan 11, 2019

chpatrick commented Jan 11, 2019

Choose a reason for hiding this comment

chpatrick Jan 11, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chpatrick commented Jan 13, 2019

hedning left a comment

Choose a reason for hiding this comment

jtojnar commented Jan 19, 2019

jtojnar commented Jan 19, 2019

jtojnar commented Jan 19, 2019

chpatrick commented Jan 20, 2019

chpatrick commented Jan 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtojnar commented Jan 21, 2019

chpatrick commented Jan 21, 2019

jtojnar commented Jan 21, 2019

chpatrick commented Jan 21, 2019

jtojnar commented Jan 21, 2019

chpatrick Jan 11, 2019 •

edited

Loading