diff options
author | Cillian de Róiste <goibhniu@fsfe.org> | 2012-07-17 02:11:59 +0200 |
---|---|---|
committer | Cillian de Róiste <goibhniu@fsfe.org> | 2012-07-18 22:52:43 +0200 |
commit | 8ebb3093202c7f7482356d6fb072ea17b5313326 (patch) | |
tree | 829d84dd246edfc2cefefcfbb480ae797238739c | |
parent | 6efd9b24d37d81c947490fe0dba1fc26edebb4e2 (diff) | |
download | nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar.gz nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar.bz2 nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar.lz nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar.xz nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.tar.zst nixlib-8ebb3093202c7f7482356d6fb072ea17b5313326.zip |
Pin xf86-video-nested to a revision that works with Xorg 7.6
-rw-r--r-- | pkgs/os-specific/linux/xf86-video-nested/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index b663a3b3232c..27522269ea3a 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,14 +3,18 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2012-06-15"; + name = "xf86-video-nested-2011-09-12"; + # Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6 src = fetchgit { url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; - rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4"; - sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c"; + rev = "fceee1716625badf698ca27dd5788a4deb8533bc"; + sha256 = ""; }; + # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77 + patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac"; + buildInputs = [ autoconf automake fontsproto libX11 libXext libtool pkgconfig renderproto utilmacros xorgserver diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad69e0290dd..2470be7eff74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6151,7 +6151,7 @@ let xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { - inherit (xorg) fontsproto renderproto utilmacros xorgserver xproto; + inherit (xorg) fontsproto renderproto utilmacros xorgserver; }; xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { |