summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorElyhaka <57923898+Elyhaka@users.noreply.github.com>2020-01-05 14:43:39 +0100
committerElyhaka <57923898+Elyhaka@users.noreply.github.com>2020-01-18 10:56:11 +0100
commitd18ac2bca18eb0b3f77511f74f192453c7184b67 (patch)
tree4b48c6ade667cec51e8ce22f58770264d6107253 /pkgs/desktops
parentc438ce12a858f24c1a2479213eaab751da45fa50 (diff)
downloadnixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar.gz
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar.bz2
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar.lz
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar.xz
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.tar.zst
nixpkgs-d18ac2bca18eb0b3f77511f74f192453c7184b67.zip
gdm: refactor to properly handle wayland sessions
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-session/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 459512017c5..3df78b88090 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
   pname = "gnome-session";
   version = "3.34.2";
 
+  outputs = ["out" "sessions"];
+
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb";
@@ -50,6 +52,15 @@ stdenv.mkDerivation rec {
       --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
   '';
 
+  # We move the GNOME sessions to another output since gnome-session is a dependency of
+  # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is
+  # enabled without proper GNOME installation.
+  postInstall = ''
+    mkdir $sessions
+    moveToOutput share/wayland-sessions "$sessions"
+    moveToOutput share/xsessions "$sessions"
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-session";