Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3b76760e389
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 470254a6da83
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 6, 2019

  1. gnome3.gnome-flashback: add systemd targets for customSessions

    @worldofpeace
    worldofpeace committed Nov 6, 2019
    Copy the full SHA
    602e14f View commit details

  2. nixos/gnome3: add gnome-flashback to systemd.packages 

    When we did the revert of adding gnome-flashback to systemd.packages [0]
I forgot to test with other display managers. If we use GDM with gnome-flashback
it appears it doesn't try to fallback to non-systemd startup and always fails and
starts the regular gnome-session. So adding gnome-flashback to systemd.packages
was perfectly fine, but we did forgot one detail. We need systemd targets for the
customSessions which is added using  mkSystemdTargetForWm in the gnome-
flashback package.

[0]: 42f567b
    @worldofpeace
    worldofpeace committed Nov 6, 2019
    Copy the full SHA
    473cd0d View commit details

Commits on Nov 12, 2019

  1. Merge pull request #72959 from worldofpeace/gnome-flashback-systemd 

    nixos/gnome3: add gnome-flashback to systemd.packages
    @worldofpeace
    worldofpeace authored Nov 12, 2019
    Copy the full SHA
    470254a View commit details
Showing with 15 additions and 0 deletions.
  1. +7 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  2. +8 −0 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
7 changes: 7 additions & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -184,6 +184,13 @@ in
enableGnomeKeyring = true;
};

systemd.packages = with pkgs.gnome3; [
gnome-flashback
] ++ (map
(wm: gnome-flashback.mkSystemdTargetForWm {
inherit (wm) wmName;
}) cfg.flashback.customSessions);

services.dbus.packages = [
pkgs.gnome3.gnome-screensaver
];
8 changes: 8 additions & 0 deletions pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
, writeTextFile
, writeShellScriptBin
, xkeyboard_config
, runCommand
}:

let
@@ -141,6 +142,13 @@ let
DesktopNames=GNOME-Flashback;GNOME;
'';
};

mkSystemdTargetForWm = { wmName }:
runCommand "gnome-flashback-${wmName}.target" {} ''
mkdir -p $out/lib/systemd/user
cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \
"$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target"
'';
};

meta = with stdenv.lib; {