From d2327e9563aeee46148a711d9da7e9b63fec0caa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 2 Sep 2023 02:30:34 +0000 Subject: [PATCH] =?UTF-8?q?gnome.gnome-control-center:=2045.beta=20?= =?UTF-8?q?=E2=86=92=2045.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/45.beta...45.rc Ports many stuff to new libadwaita widgets. setxkbmap is needed for tests, while at it enable tests. Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- .../core/gnome-control-center/default.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index fb2e840ece6b..e238f2afb169 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -50,6 +50,7 @@ , polkit , python3 , samba +, setxkbmap , shadow , shared-mime-info , sound-theme-freedesktop @@ -62,15 +63,16 @@ , gnome-user-share , gnome-remote-desktop , wrapGAppsHook +, xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "45.beta"; + version = "45.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DGwHNKAbNK+RSMzx28xalZ88+bsEpTvTB6nykORe8p4="; + sha256 = "sha256-kiyRn4VMZZcXelwXK5Q5zLIB9OYerMVD4GGJmPuo63M="; }; patches = [ @@ -142,11 +144,34 @@ stdenv.mkDerivation rec { gst-plugins-good ]); + nativeCheckInputs = [ + python3.pkgs.python-dbusmock + setxkbmap + xvfb-run + ]; + + doCheck = true; + preConfigure = '' # For ITS rules addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" ''; + checkPhase = '' + runHook preCheck + + testEnvironment=( + # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 + "ADW_DISABLE_PORTAL=1" + "XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}" + ) + + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck + ''; + postInstall = '' # Pull in WebP support for gnome-backgrounds. # In postInstall to run before gappsWrapperArgsHook.