weston: 6.0.1 -> 7.0.0

Announcement:
https://lists.freedesktop.org/archives/wayland-devel/2019-August/040812.html
This commit is contained in:
Michael Weiss 2019-08-24 12:21:12 +02:00
parent a48865eea0
commit 1a8ea5cead
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig { stdenv, fetchurl, meson, ninja, pkgconfig
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2 , colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols , 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
@ -10,11 +10,11 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weston"; pname = "weston";
version = "6.0.1"; version = "7.0.0";
src = fetchurl { src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0";
}; };
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols libwebp wayland-protocols
colord lcms2 colord lcms2 pipewire
]; ];
mesonFlags= [ mesonFlags= [
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-Dbackend-rdp=${boolToString (freerdp != null)}" "-Dbackend-rdp=${boolToString (freerdp != null)}"
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true! "-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
"-Dremoting=false" # TODO "-Dremoting=false" # TODO
"-Dpipewire=${boolToString (pipewire != null)}"
"-Dimage-webp=${boolToString (libwebp != null)}" "-Dimage-webp=${boolToString (libwebp != null)}"
"-Dsimple-dmabuf-drm=" # Disables all drivers "-Dsimple-dmabuf-drm=" # Disables all drivers
"-Ddemo-clients=false" "-Ddemo-clients=false"

View File

@ -21220,6 +21220,7 @@ in
libva = null; libva = null;
libwebp = null; libwebp = null;
xwayland = null; xwayland = null;
pipewire = null;
}; };
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};