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..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
@@ -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;
         }
       );