Merge pull request #165446 from bobby285271/gnome-mahjongg
gnome.gnome-mahjongg: fix build with meson 0.61
This commit is contained in:
commit
6dd4a7d853
@ -1,6 +1,20 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
|
||||
, librsvg, gettext, itstool, libxml2
|
||||
, meson, ninja, glib, vala, desktop-file-utils
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, librsvg
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, glib
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,12 +26,30 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# data/meson.build:24:0: ERROR: Function does not take positional arguments.
|
||||
# data/meson.build:45:0: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch";
|
||||
sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja vala desktop-file-utils
|
||||
pkg-config gnome.adwaita-icon-theme
|
||||
libxml2 itstool gettext wrapGAppsHook
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
gnome.adwaita-icon-theme
|
||||
libxml2
|
||||
itstool
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
glib # for glib-compile-schemas
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
|
Loading…
Reference in New Issue
Block a user