|
|
|
@ -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 = '' |
|
|
|
|