gitg: 3.30.1 -> 3.32.0
* adds libdazzle * intltool -> gettext * hicolor-icon-theme as native for setup-hook * re-enable tests https://gitlab.gnome.org/GNOME/gitg/blob/v3.32.0/NEWS
This commit is contained in:
parent
4f692b1682
commit
4c37b4ae9c
|
@ -1,8 +1,8 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, vala_0_42
|
, vala
|
||||||
, intltool
|
, gettext
|
||||||
, pkgconfig
|
, pkgconfig
|
||||||
, gtk3
|
, gtk3
|
||||||
, glib
|
, glib
|
||||||
|
@ -24,34 +24,35 @@
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, python3
|
, python3
|
||||||
|
, hicolor-icon-theme
|
||||||
|
, libdazzle
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gitg";
|
pname = "gitg";
|
||||||
version = "3.30.1";
|
version = "3.32.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
|
sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix build with latest libgit2-glib
|
# https://gitlab.gnome.org/GNOME/gitg/issues/213
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch;
|
url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
|
||||||
sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw";
|
sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x meson_post_install.py
|
chmod +x meson_post_install.py
|
||||||
patchShebangs meson_post_install.py
|
patchShebangs meson_post_install.py
|
||||||
sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
|
|
||||||
|
|
||||||
substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
|
substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
|
doCheck = true;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
|
||||||
gtksourceview
|
gtksourceview
|
||||||
gtkspell3
|
gtkspell3
|
||||||
json-glib
|
json-glib
|
||||||
|
libdazzle
|
||||||
libgee
|
libgee
|
||||||
libgit2-glib
|
libgit2-glib
|
||||||
libpeas
|
libpeas
|
||||||
|
@ -72,12 +74,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
intltool
|
hicolor-icon-theme
|
||||||
|
gettext
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkgconfig
|
pkgconfig
|
||||||
python3
|
python3
|
||||||
vala_0_42 # fails build with 0.44, drop in >3.30.1
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue