about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authornikstur <nikstur@outlook.com>2024-01-28 13:38:09 +0100
committernikstur <nikstur@outlook.com>2024-01-28 13:38:09 +0100
commitdff64f549e69a9fe83111628e0aae28654a1d6fc (patch)
tree8a17c3970df869108dedc317b2c21953a7cc0424 /nixos/modules
parenta9161ceb5a3669ced280ce0805ad38470b5904b2 (diff)
downloadnixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar.gz
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar.bz2
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar.lz
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar.xz
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.tar.zst
nixlib-dff64f549e69a9fe83111628e0aae28654a1d6fc.zip
nixos/x11: remove leading slash from environment.etc path
Even if the tools that assemble /etc can handle leading slashes, this
still is not correct. For example, you could have both /X11 and X11 in
environment.etc which makes overriding hard.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/x11/xserver.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 36f25d5547ca..38fb1074fcdf 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -710,9 +710,9 @@ in
           '';
         }
       # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
-      // (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
+      // (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
         {
-          ${cfgPath}.source = xorg.xf86inputevdev.out + "/share" + cfgPath;
+          ${cfgPath}.source = xorg.xf86inputevdev.out + "/share/" + cfgPath;
         });
 
     environment.systemPackages = utils.removePackagesByName