about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorRobert Irelan <rirelan@gmail.com>2015-10-17 23:20:37 -0700
committerVladimír Čunát <vcunat@gmail.com>2015-10-19 09:06:33 +0200
commit678c81b74df7e531e591c007d2d672e7f9f8c1f2 (patch)
tree5e24d49dc266fe254333668968679ab497bd2bd0 /pkgs/servers/x11
parent3d6070f0a7aef517b934e49a03c071ba2d5bde30 (diff)
downloadnixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar.gz
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar.bz2
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar.lz
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar.xz
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.tar.zst
nixlib-678c81b74df7e531e591c007d2d672e7f9f8c1f2.zip
xorg.xf86-video-ast: 0.98.0 -> 1.1.5 (close #10451)
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 778fe03a0c28..3a6bb552bbe9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1518,11 +1518,11 @@ let
   }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
   xf86videoast = (mkDerivation "xf86videoast" {
-    name = "xf86-video-ast-0.98.0";
+    name = "xf86-video-ast-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2;
-      sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh";
+      url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2;
+      sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 67e125528c95..ef3414bd800c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2