From c7d92f948558c7cc0620071915c8b99a41b2689c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 22 May 2016 21:35:12 +0200 Subject: [PATCH] xf86-video-modesetting: Remove This driver is part of xorg-server now, so we were using an outdated version. --- nixos/modules/services/x11/xserver.nix | 1 + pkgs/servers/x11/xorg/default.nix | 11 ----------- pkgs/servers/x11/xorg/tarballs-7.7.list | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 9cb9c8de31d7..4f65ed72d36e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -16,6 +16,7 @@ let virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; ati = { modules = with pkgs.xorg; [ xf86videoati glamoregl ]; }; intel = { modules = with pkgs.xorg; [ xf86videointel glamoregl ]; }; + modesetting = { modules = []; }; }; fontsForXServer = diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 45c01d74cdb3..32a5c0bd588b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1842,17 +1842,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - xf86videomodesetting = (mkDerivation "xf86videomodesetting" { - name = "xf86-video-modesetting-0.9.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2; - sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"; - }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; - xf86videoneomagic = (mkDerivation "xf86videoneomagic" { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d0a812e45d6a..f6b8af5468fe 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -144,7 +144,6 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2