From dff64f549e69a9fe83111628e0aae28654a1d6fc Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 28 Jan 2024 13:38:09 +0100 Subject: [PATCH] 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. --- nixos/modules/services/x11/xserver.nix | 4 ++-- 1 file 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