From bc9a291779e9438c6bf9b0a09d86c90c58e18585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 28 Jan 2013 19:45:07 +0100 Subject: [PATCH] wayland: update to 1.0.4. Also updated weston to 1.0.4, which now fails to build. Doh! --- pkgs/applications/window-managers/weston/default.nix | 8 ++++---- pkgs/development/libraries/wayland/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index e4a4ee5a75a..c8285475f8d 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa90x, libxkbcommon, pixman -, cairo, libxcb, libXcursor, x11, udev, libdrm2_4_39, mtdev +, cairo, libxcb, libXcursor, x11, udev, libdrm2_4_40, mtdev , libjpeg, pam, autoconf, automake, libtool }: -let version = "1.0.3"; in +let version = "1.0.4"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0ls8w1l8k9fx0hjlw7qzjb98l911agigf5s2dna3xsjlyv9afdii"; + sha256 = "1841sd6i8nq9gs1xkx8lwcg4lzy6yfcs95nnsfaf0y1ppd6c9sj2"; }; patches = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ pkgconfig wayland mesa90x libxkbcommon pixman - cairo libxcb libXcursor x11 udev libdrm2_4_39 mtdev + cairo libxcb libXcursor x11 udev libdrm2_4_40 mtdev libjpeg pam autoconf automake libtool ]; preConfigure = "autoreconf -vfi"; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 1b774adfb37..6995a4019a2 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, libffi, expat, doxygen }: -let version = "1.0.3"; in +let version = "1.0.4"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "04sr7bl1f0qk837qpc9zpxirkgvlp3pval3326mbld553ghmxgpn"; + sha256 = "074n94d79bqvihf9wmszvar8r9v4g4n1h9m8vs8ki6xjhsk07s4d"; }; buildInputs = [ pkgconfig libffi expat doxygen ];