From efb08d9060b804c4d8525c42be2b960a53354a0a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 10 Aug 2023 08:28:06 +0000 Subject: [PATCH] =?UTF-8?q?gnome.gnome-remote-desktop:=2045.alpha=20?= =?UTF-8?q?=E2=86=92=2045.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/45.alpha...45.beta Provides a meson option for disabling tests, so we can clean things up https://github.com/GNOME/gnome-remote-desktop/commit/9e77f0558789546fff0281093217c50a5352fb93s Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- .../core/gnome-remote-desktop/default.nix | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index b260cf7db14d..7ed70fb2362b 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -21,20 +21,16 @@ , fdk_aac , tpm2-tss , fuse3 -, mesa -, libgudev -, xvfb-run -, dbus , gnome }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "45.alpha"; + version = "45.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-WV2RXy3rNyH5fN2z4D/ZTzjXY3hKaGaIisQsMDnDHi0="; + hash = "sha256-69YoA6URAU9WOCofS2VUTbwpTv6A2BxEjlxfRSnHtvw="; }; nativeBuildInputs = [ @@ -62,33 +58,13 @@ stdenv.mkDerivation rec { libxkbcommon pipewire systemd - ] ++ nativeCheckInputs; - - nativeCheckInputs = [ - mesa # for gbm - libgudev - xvfb-run - python3.pkgs.dbus-python - python3.pkgs.pygobject3 - dbus # for dbus-run-session ]; mesonFlags = [ "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" + "-Dtests=false" # Too deep of a rabbit hole. ]; - # Too deep of a rabbit hole. - doCheck = false; - - postPatch = '' - patchShebangs \ - tests/vnc-test-runner.sh \ - tests/run-vnc-tests.py - - substituteInPlace tests/vnc-test-runner.sh \ - --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname;