diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 12c2e5da1b98..f0b940776128 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchzip, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchzip +, meson, ninja, pkg-config, python3, python3Packages, wayland-scanner , libxkbcommon, mesa, pixman, xorg, wayland, gtest }: stdenv.mkDerivation { pname = "sommelier"; - version = "104.0"; + version = "123.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "af5434fd9903936a534e1316cbd22361e67949ec"; + passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6"; stripRoot = false; - sha256 = "LungQqHQorHIKpye2SDBLuMHPt45C1cPYcs9o5Hc3cw="; + sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ + meson ninja pkg-config python3 python3Packages.jinja2 wayland-scanner + ]; buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + preConfigure = '' + patchShebangs gen-shim.py + ''; + doCheck = true; nativeCheckInputs = [ gtest ];