gnome3.gnome-nibbles: fix build with latest Vala

This commit is contained in:
Jan Tojnar 2021-03-25 16:30:34 +01:00
parent e235c63838
commit 81f75adc01
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,7 +1,26 @@
{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook { lib
, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 , stdenv
, libxml2, libgee, libgnome-games-support, meson, ninja , fetchurl
, desktop-file-utils, hicolor-icon-theme}: , fetchpatch
, pkg-config
, gnome3
, gtk3
, wrapGAppsHook
, librsvg
, gsound
, clutter-gtk
, gettext
, itstool
, vala
, python3
, libxml2
, libgee
, libgnome-games-support
, meson
, ninja
, desktop-file-utils
, hicolor-icon-theme
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-nibbles"; pname = "gnome-nibbles";
@ -12,14 +31,40 @@ stdenv.mkDerivation rec {
sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
}; };
nativeBuildInputs = [ patches = [
meson ninja vala python3 # Fix build with recent Vala.
pkg-config wrapGAppsHook gettext itstool libxml2 (fetchpatch {
desktop-file-utils hicolor-icon-theme url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch";
sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch";
sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ=";
})
]; ];
nativeBuildInputs = [
meson
ninja
vala
python3
pkg-config
wrapGAppsHook
gettext
itstool
libxml2
desktop-file-utils
hicolor-icon-theme
];
buildInputs = [ buildInputs = [
gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme gtk3
libgee libgnome-games-support librsvg
gsound
clutter-gtk
gnome3.adwaita-icon-theme
libgee
libgnome-games-support
]; ];
passthru = { passthru = {