diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-24 10:34:40 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-24 10:35:20 +0100 |
| commit | 4e57e7f7c6db9a9c00f527eff80cb37890ba516d (patch) | |
| tree | 41938788ec7b3f93d910fc7dad5d6d4374a6cbed /nixos | |
| parent | 6fe465f500663205c2388a3879b6010de4de2c7d (diff) | |
| download | nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar.gz nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar.bz2 nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar.lz nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar.xz nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.tar.zst nixlib-4e57e7f7c6db9a9c00f527eff80cb37890ba516d.zip | |
Revert "gdm module: only make xserver args overrideable"
This reverts commit a5aa9269027d638b80fe1f23bcf8887ca80d034b. This allows gdm to run again, the test is still failing.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6c63fede857f..1bf4fd3c089e 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -99,8 +99,7 @@ in services.xserver.displayManager.job = { environment = { - GDM_X_SERVER_EXTRA_ARGS = toString - (filter (arg: arg != "-terminate") cfg.xserverArgs); + GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; |