Unverified Commit fe0ac61d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

nixos/{xserver,fonts}: fix... 

nixos/{xserver,fonts}: fix https://github.com/NixOS/nixpkgs/pull/482828#issuecomment-3800330914 (#484062)
parents 0b221245 b1aae11b

nixos/modules/config/fonts/fontdir.nix

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ let 
        nativeBuildInputs = [

          gzip

          mkfontscale

          mkfontscale

        ];

      }

      ''

nixos/modules/services/x11/xserver.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }

      );