summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-12-19 12:28:38 +0100
committerMichael Weiss <dev.primeos@gmail.com>2022-02-04 22:40:34 +0100
commitb7404f6d94e96fabec9ed455fbc53cda1f24cbae (patch)
tree26c7bb55a7c4ef130ce5ad44ff62ba60e25df627
parent2add1758ab174da8f1244df02226827037210b02 (diff)
downloadnixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar.gz
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar.bz2
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar.lz
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar.xz
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.tar.zst
nixpkgs-b7404f6d94e96fabec9ed455fbc53cda1f24cbae.zip
weston: 9.0.0 -> 10.0.0
Release announcement:
https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html

Note: weston-launch was deprecated and is now disabled by default.
-rw-r--r--pkgs/applications/window-managers/weston/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 598e78be264..043e2b02a7f 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3
 , wayland, libGL, mesa, libxkbcommon, cairo, libxcb
 , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
 , colord, lcms2, pipewire ? null
@@ -10,14 +10,14 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "weston";
-  version = "9.0.0";
+  version = "10.0.0";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
+    sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ];
   buildInputs = [
     wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
     mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbff3553b42..533c7f5c0d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29343,7 +29343,7 @@ with pkgs;
 
   chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
 
-  weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
+  weston = callPackage ../applications/window-managers/weston { };
 
   whalebird = callPackage ../applications/misc/whalebird {
     electron = electron_14;