cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

weston: 10.0.1 -> 11.0.0

Browse source
This commit is contained in:
Alyssa Ross 2022-09-24 10:06:09 +00:00
parent 41b7ca7767
commit 198b38f54d
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/window-managers/weston/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch { lib, stdenv, fetchurl
, meson, ninja, pkg-config, python3, wayland-scanner , meson, ninja, pkg-config, python3, wayland-scanner
, cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput
, libjpeg, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland , libjpeg, libseat, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland
, wayland-protocols, xlibsWrapper , wayland-protocols, xlibsWrapper
, pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null
, libva ? null, libwebp ? null, xwayland ? null , libva ? null, libwebp ? null, xwayland ? null
@ -10,26 +10,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weston"; pname = "weston";
version = "10.0.1"; version = "11.0.0";
src = fetchurl { src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
sha256 = "05a10gfbadyxkwgsncc5vc343f493csgh10vk0878nl6d98557la"; sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6";
}; };
patches = [
# Fix race condition in build system
(fetchpatch {
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch";
sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU=";
})
];
nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
buildInputs = [ buildInputs = [
cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput
libjpeg libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam pango libjpeg libseat libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam
pipewire udev vaapi wayland wayland-protocols xlibsWrapper pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper
]; ];
mesonFlags= [ mesonFlags= [
@ -44,7 +36,6 @@ stdenv.mkDerivation rec {
"-Dtest-junit-xml=false" "-Dtest-junit-xml=false"
# TODO: # TODO:
#"--enable-clients" #"--enable-clients"
#"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ lib.optionals (xwayland != null) [ ] ++ lib.optionals (xwayland != null) [
"-Dxwayland-path=${xwayland.out}/bin/Xwayland" "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
]; ];