diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:17:36 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:17:36 +0100 |
commit | a0f3faf34e6b2f024ef86d84ad80c124c33b941a (patch) | |
tree | 11eed0d9ee2e444dde60899e8d290ca722bab1c3 /pkgs/servers/x11 | |
parent | 389143d808be38fe4e0def83946c5ab2fd7c5376 (diff) | |
parent | cef0bcefc6544513fec9dec49686932ef15f1734 (diff) | |
download | nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.gz nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.bz2 nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.lz nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.xz nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.zst nixlib-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.zip |
Merge remote-tracking branch 'origin/glibc-2.20' into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a29d184e48c6..2fa9a7fddc5d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -194,6 +194,11 @@ in "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/patch/" + + "?id=1cbbc03c4b37d57760c57bd2e0b0f89d744a5795"; + sha256 = "1qkhwj2yal0cz15lv9557d10ylvxlq05ibq43pm2rrvqdg3mb6h4"; + })]; }; xf86videoati = attrs: attrs // { @@ -209,6 +214,11 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" + + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; + sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; + })]; }; xf86videoqxl = attrs: attrs // { |