diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-16 03:53:22 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-17 01:15:14 +0200 |
| commit | f12fb84ee1e242e953f38605ce5247df81a26b07 (patch) | |
| tree | 65b87f5e8a537631ef967b34ab23db1c143b5fed | |
| parent | pantheon.elementary-settings-daemon: backport patches for latest libgweather API (diff) | |
| download | nixpkgs-origin/gnome-40.tar.gz | |
gitg: disable testsorigin/gnome-40
They started faiing with the same issue as before they were enabled in 2019.
I tried running them in xvfb and dbus session (see e.g. libdazzle expression) but without success.
I wonder how it could have worked for so long.ů
I also cleaned up the expression and corrected the license while at it.
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/gitg/default.nix | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 0f4f8e67737a..492057515912 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , vala , gettext , pkg-config @@ -36,16 +36,16 @@ stdenv.mkDerivation rec { sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - - substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" - ''; - - doCheck = true; - - enableParallelBuilding = true; + nativeBuildInputs = [ + gobject-introspection + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; buildInputs = [ adwaita-icon-theme @@ -63,16 +63,14 @@ stdenv.mkDerivation rec { libsoup ]; - nativeBuildInputs = [ - gobject-introspection - gettext - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" + ''; preFixup = '' gappsWrapperArgs+=( @@ -91,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } |