From 2be7adad8e40ffc7c75223dcb518b1294e12b174 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 17:07:37 +0100 Subject: [PATCH 1/2] nixos/{xserver,fonts}: fix https://github.com/NixOS/nixpkgs/pull/482828#issuecomment-3800330914 --- nixos/modules/config/fonts/fontdir.nix | 1 - nixos/modules/services/x11/xserver.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 1a4fbfa6808d..9f2fe2fb3437 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -21,7 +21,6 @@ let nativeBuildInputs = [ gzip mkfontscale - mkfontscale ]; } '' diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7c16d2ea8900..3f5a169eeae9 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -877,7 +877,7 @@ in cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in { - ${cfgPath}.source = xf86-input-evdev.out + "/share/" + cfgPath; + ${cfgPath}.source = pkgs.xf86-input-evdev.out + "/share/" + cfgPath; } ); From b1aae11bdf5d1de5fff2ff7f3afed30f81109839 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 26 Jan 2026 17:54:22 +0100 Subject: [PATCH 2/2] nixos/xserver: fix eval of videoDrivers --- 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 3f5a169eeae9..bd095ce0b408 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -57,10 +57,10 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. videoDrivers = - mapAttrs' (name: value: rec { + mapAttrs' (name: value: { name = removePrefix "xf86-video-" value.pname; value = { - modules = value; + modules = [ value ]; }; }) knownVideoDriverPackages // videoDriverAliases