diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 18:54:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 18:55:30 +0200 |
| commit | 99e300c4f8888d0d4a4e4e3c7e75613019c93bd9 (patch) | |
| tree | f071d921d93a34aafc3b901faf367c4ef1cdbc90 /pkgs/servers | |
| parent | b1d225b64521058869a1570c6d58b76caf21f6e3 (diff) | |
| download | nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar.gz nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar.bz2 nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar.lz nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar.xz nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.tar.zst nixlib-99e300c4f8888d0d4a4e4e3c7e75613019c93bd9.zip | |
xorg: add xf86-video-qxl
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6945d6559fbb..c4dfa983f55f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1644,6 +1644,16 @@ let buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; + xf86videoqxl = (mkDerivation "xf86videoqxl" { + name = "xf86-video-qxl-0.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2; + sha256 = "09sjpkg7klzzg9sagmqpsw911501vqk9wdd4nr0jkqqanvkx39s3"; + }; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + xf86videor128 = (mkDerivation "xf86videor128" { name = "xf86-video-r128-6.9.2"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a81b1a4ac225..7d8fd4d8b756 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -202,7 +202,11 @@ in }; xf86videovmware = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + buildinputs = attrs.buildinputs ++ [ args.mesa_drivers ]; # for libxatracker + }; + + xf86videoqxl = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.spice_protocol ]; }; xdriinfo = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 417d12ddadc9..93acd927f3bf 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -138,6 +138,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 |