diff options
| author | Bobby Rong <rjl931189261@126.com> | 2024-07-02 14:17:13 +0000 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2024-07-05 00:49:41 +0800 |
| commit | 5e3514cc3f4cfc1073f27fadc9f6e24c23d195ad (patch) | |
| tree | 72934f2ac33a37a062a09d93d6bfe6313e276422 /pkgs/desktops/gnome/core/gnome-control-center/default.nix | |
| parent | de2ed0503307eedde58c39241603bf0b87932e86 (diff) | |
gnome.gnome-control-center: 46.2 → 46.3
https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/46.2...46.3 Some tests are now disabled if Xvfb is missing, I imagine we don't need xvfb-run when the X11SessionTestCase helper actually takes care of X and system/session bus. https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/51bf36ac68051aaf183c1aa0b45b8af7cc479c70
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-control-center/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/default.nix | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6602a3795834c..8b1ae6d341360 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,16 +68,16 @@ , gnome-user-share , gnome-remote-desktop , wrapGAppsHook4 -, xvfb-run +, xorgserver }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-YzXGy4Fk5XTbUh//Yc+j36pV8dtmrjvKAnUKGT4cTz0="; + hash = "sha256-l9xsfR3uGVkU88vIRbaBZLdhFIDYk760EQBsFerkbLk="; }; patches = [ @@ -155,9 +155,10 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + python3.pkgs.pygobject3 # for test-networkmanager-service.py python3.pkgs.python-dbusmock setxkbmap - xvfb-run + xorgserver ]; doCheck = true; @@ -167,19 +168,10 @@ stdenv.mkDerivation (finalAttrs: { 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 + preCheck = '' + # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 + export ADW_DISABLE_PORTAL=1 + export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas} ''; postInstall = '' |