Merge pull request #167266 from bobby285271/hitori

gnome.hitori: 3.38.3 -> 3.38.4
This commit is contained in:
Jan Tojnar 2022-04-09 03:43:34 +02:00 committed by GitHub
commit fbade75c0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
@ -15,27 +14,17 @@
, gettext
, itstool
, desktop-file-utils
, adwaita-icon-theme
}:
stdenv.mkDerivation rec {
pname = "hitori";
version = "3.38.3";
version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk=";
sha256 = "iZPMkfuSN4jjieA+wqp4dtFcErrZIEz2Wy/6DtOSL30=";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:3:0: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch";
sha256 = "LwBpFFr+vLacLTpto7PwvO1p2lku6epyEv9YZvUvW+g=";
})
];
nativeBuildInputs = [
meson
ninja
@ -52,7 +41,6 @@ stdenv.mkDerivation rec {
glib
gtk3
cairo
adwaita-icon-theme
];
postPatch = ''