diff options
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 30 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index be08477a1d2..beca7414c36 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -79,6 +79,16 @@ let buildInputs = [pkgconfig ]; })) // {inherit ;}; + dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) { + name = "dri3proto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; + sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { name = "encodings-1.0.4"; builder = ./builder.sh; @@ -909,6 +919,16 @@ let buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; + libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) { + name = "libxshmfence-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; + sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + }; + buildInputs = [pkgconfig xproto ]; + })) // {inherit xproto ;}; + lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { name = "lndir-1.0.3"; builder = ./builder.sh; @@ -959,6 +979,16 @@ let buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; + presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) { + name = "presentproto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2; + sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 2eb08b1831d..24279ac70f9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -5,6 +5,8 @@ mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 +mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 +mirror://xorg/individual/proto/presentproto-1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -50,6 +52,7 @@ mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 |