public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland, weston: update to 1.3.1, fix weston build

Browse Source 
Also make Hydra build weston, so we can see the breakages in future.
This commit is contained in:
Vladimír Čunát 2013-11-23 23:30:47 +01:00
parent 21f36d7316
commit 30666ed5ad
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/window-managers/weston/default.nix
View File

@ -2,30 +2,32 @@
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
, libjpeg, pam, autoconf, automake, libtool }: , libjpeg, pam, autoconf, automake, libtool }:
let version = "1.0.5"; in let version = "1.3.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "weston-${version}"; name = "weston-${version}";
src = fetchurl { src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0"; sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p";
}; };
buildInputs = [ pkgconfig wayland mesa libxkbcommon buildInputs = [ pkgconfig wayland mesa libxkbcommon
cairo libxcb libXcursor x11 udev libdrm mtdev cairo libxcb libXcursor x11 udev libdrm mtdev
libjpeg pam autoconf automake libtool ]; libjpeg pam /*autoconf automake libtool*/ ];
preConfigure = "autoreconf -vfi"; #preConfigure = "autoreconf -vfi";
# prevent install target to chown root weston-launch, which fails NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";
configureFlags = ''
--disable-setuid-install configureFlags = [
''; "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
];
meta = { meta = {
description = "Reference implementation of a Wayland compositor"; description = "Reference implementation of a Wayland compositor";
homepage = http://wayland.freedesktop.org/; homepage = http://wayland.freedesktop.org/;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
}; };
} }

4
pkgs/development/libraries/wayland/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
let version = "1.2.1"; in let version = "1.3.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wayland-${version}"; name = "wayland-${version}";
src = fetchurl { src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0vqngxpavcxvjwlw7afgrbv7qvmd489sj555wrnxjc8p10mjw1kq"; sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f";
}; };
buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];

6
pkgs/top-level/all-packages.nix
View File

@ -9012,11 +9012,7 @@ let
gnutls = gnutls32; gnutls = gnutls32;
}; };
weston = callPackage ../applications/window-managers/weston { weston = callPackage ../applications/window-managers/weston { };
cairo = cairo.override {
glSupport = true;
};
};
windowmaker = callPackage ../applications/window-managers/windowmaker { }; windowmaker = callPackage ../applications/window-managers/windowmaker { };