diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 4401915d40ba..cfe0903cce7b 100644 --- a/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -4,7 +4,7 @@ , fetchurl , gettext , glib -, gnome-bluetooth_1_0 +, gnome-bluetooth , gnome-desktop , gnome-panel , gnome-session @@ -31,7 +31,7 @@ }: let pname = "gnome-flashback"; - version = "3.44.0"; + version = "3.46.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -62,7 +62,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo="; + sha256 = "sha256-eo1cAzEOTfrdGKZeAKN3QQMq/upUGN1oBKl1xLCYAEU="; }; # make .desktop Execs absolute @@ -82,7 +82,7 @@ let rm -r $out/share/gnome-session rm -r $out/share/xsessions - rm -r $out/libexec + rm $out/libexec/gnome-flashback-metacity ''; nativeBuildInputs = [ @@ -95,7 +95,7 @@ let buildInputs = [ glib - gnome-bluetooth_1_0 + gnome-bluetooth gnome-desktop gsettings-desktop-schemas gtk3 @@ -180,9 +180,11 @@ let dontWrapGApps = true; # We want to do the wrapping ourselves. # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session. + # We need to pass the --builtin flag so that gnome-session invokes gnome-session-binary instead of systemd. + # If systemd is used, it doesn't use the environment we set up here and so it can't find the .desktop files. preFixup = '' makeWrapper ${gnome-session}/bin/gnome-session $out \ - --add-flags "--session=gnome-flashback-${wmName}" \ + --add-flags "--session=gnome-flashback-${wmName} --builtin" \ --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \ --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \ "''${gappsWrapperArgs[@]}" \ |