mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 05:05:29 +03:00
gnome.gdm: 41.0 → 41.3
Remove nvidiaWayland NixOS option since it was severely out of date. https://ftp.gnome.org/pub/GNOME/sources/gdm/41/gdm-41.3.news
This commit is contained in:
parent
c1556aac51
commit
1a11eb1eb3
2 changed files with 4 additions and 26 deletions
|
@ -53,6 +53,8 @@ in
|
||||||
"autoLogin"
|
"autoLogin"
|
||||||
"user"
|
"user"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.")
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -83,17 +85,6 @@ in
|
||||||
default = true;
|
default = true;
|
||||||
description = ''
|
description = ''
|
||||||
Allow GDM to run on Wayland instead of Xserver.
|
Allow GDM to run on Wayland instead of Xserver.
|
||||||
Note to enable Wayland with Nvidia the <option>nvidiaWayland</option>
|
|
||||||
must not be disabled.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
nvidiaWayland = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = ''
|
|
||||||
Whether to allow wayland to be used with the proprietary
|
|
||||||
NVidia graphics driver.
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -230,19 +221,6 @@ in
|
||||||
|
|
||||||
services.dbus.packages = [ gdm ];
|
services.dbus.packages = [ gdm ];
|
||||||
|
|
||||||
# We duplicate upstream's udev rules manually to make wayland with nvidia configurable
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
# disable Wayland on Cirrus chipsets
|
|
||||||
ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
|
|
||||||
# disable Wayland on Hi1710 chipsets
|
|
||||||
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
|
|
||||||
${optionalString (!cfg.gdm.nvidiaWayland) ''
|
|
||||||
DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
|
|
||||||
''}
|
|
||||||
# disable Wayland when modesetting is disabled
|
|
||||||
IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
|
|
||||||
'';
|
|
||||||
|
|
||||||
systemd.user.services.dbus.wantedBy = [ "default.target" ];
|
systemd.user.services.dbus.wantedBy = [ "default.target" ];
|
||||||
|
|
||||||
programs.dconf.profiles.gdm =
|
programs.dconf.profiles.gdm =
|
||||||
|
|
|
@ -43,13 +43,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gdm";
|
pname = "gdm";
|
||||||
version = "41.0";
|
version = "41.3";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw=";
|
sha256 = "uwtlCnzqkPCaMyhPvQKXUxVAfvwY6BQAmFLRvK00N9Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue