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

Merge pull request #14547 from groxxda/bump/wayland

Browse Source 
wayland: 1.9.0 -> 1.10.0, weston: 1.9.0 -> 1.10.0, wayland-protocols: init at 1.3
This commit is contained in:
Franz Pletz 2016-04-10 01:11:55 +02:00
commit 2579128897
4 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,24 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null , libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default # beware of null defaults, as the parameters *are* supplied by callPackage by default
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "weston-${version}"; name = "weston-${version}";
version = "1.9.0"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1ks8mja6glzy2dkayi535hd6w5c5h021bqk7vzgv182g33rh66ww"; sha256 = "1hd5593zz5s3s07vb6linp6akbs62wy2ijh3g7gksafq016h1cp0";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
libwebp libwebp wayland-protocols
]; ];
configureFlags = [ configureFlags = [

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig { lib, stdenv, fetchurl, pkgconfig
, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
}: }:
@ -8,18 +8,18 @@ assert expat != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wayland-${version}"; name = "wayland-${version}";
version = "1.9.0"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; sha256 = "1p307ly1yyqjnzn9dbv78yffql2qszn84qk74lwanl3gma8fgxjb";
}; };
configureFlags = "--with-scanner --disable-documentation"; configureFlags = "--with-scanner --disable-documentation";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ]; buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
meta = { meta = {
description = "Reference implementation of the wayland protocol"; description = "Reference implementation of the wayland protocol";

27
pkgs/development/libraries/wayland/protocols.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, stdenv, fetchurl, pkgconfig
, wayland
}:
stdenv.mkDerivation rec {
name = "wayland-protocols-${version}";
version = "1.3";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0byqvrsm6bkvylvzqy8wh5wpszwl5ra1z0yjqzqmw8przlrhdkbb";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ wayland ];
meta = {
description = "Wayland protocol extensions";
homepage = http://wayland.freedesktop.org/;
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
passthru.version = version;
}

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

@ -9006,6 +9006,8 @@ in
graphviz = graphviz-nox; graphviz = graphviz-nox;
}; };
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
webkit = webkitgtk; webkit = webkitgtk;
wcslib = callPackage ../development/libraries/wcslib { }; wcslib = callPackage ../development/libraries/wcslib { };