diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2012-10-18 20:49:22 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2012-10-18 20:49:22 +0400 |
commit | 0e930058aeeb1b70caa870c762724ca87036abec (patch) | |
tree | 0efc7e8e01d407987f97bdc717e9aeee61b59a41 /pkgs/servers/x11 | |
parent | 76c010b928952e042dcdbdef16d2bbf101e133f8 (diff) | |
download | nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar.gz nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar.bz2 nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar.lz nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar.xz nixlib-0e930058aeeb1b70caa870c762724ca87036abec.tar.zst nixlib-0e930058aeeb1b70caa870c762724ca87036abec.zip |
Update TigerVNC to SVN checkout that at least builds..
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/extra.list | 3 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 23 |
3 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e92d5e4a6667..8508f87e043f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1936,6 +1936,16 @@ let }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; + + xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) { + name = "xorg-server-1.13.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; + sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; + }; + buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ]; + })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 3af867171ef3..f7f139b19c1c 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,7 @@ -mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 -mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index de32722ed7c4..fdb68b237f07 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -230,6 +230,29 @@ in ''; }; + xorgserver_1_13_0 = attrs: attrs // { + configureFlags = "--enable-xcsecurity"; # enable SECURITY extension + patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; + buildInputs = attrs.buildInputs ++ + [ args.zlib args.udev args.mesa args.dbus.libs + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont + xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto + ]; + propagatedBuildInputs = + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto + xorg.dri2proto xorg.kbproto + ]; + postInstall = + '' + rm -fr $out/share/X11/xkb/compiled + ln -s /var/tmp $out/share/X11/xkb/compiled + ''; + }; + libSM = attrs: attrs // { propagatedBuildInputs = [ xorg.libICE ]; } // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") { |