diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-25 16:30:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:42:56 +0200 |
| commit | 81f75adc017e6c7aeffebbdb3185b3b54998486a (patch) | |
| tree | c7027d2771b741d46ab04cb0d3aab0a7e48207fe /pkgs/desktops/gnome-3 | |
| parent | e235c63838d3e78d78d2b4091e41588dfbe1771f (diff) | |
| download | nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar.gz nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar.bz2 nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar.lz nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar.xz nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.tar.zst nixpkgs-81f75adc017e6c7aeffebbdb3185b3b54998486a.zip | |
gnome3.gnome-nibbles: fix build with latest Vala
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 63 |
1 files changed, 54 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 501b894a1df..c3d9fb19725 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,7 +1,26 @@ -{ lib, stdenv, fetchurl, 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}: +{ lib +, stdenv +, fetchurl +, 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 { pname = "gnome-nibbles"; @@ -12,14 +31,40 @@ stdenv.mkDerivation rec { sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; }; + patches = [ + # Fix build with recent Vala. + (fetchpatch { + 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 + meson + ninja + vala + python3 + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + desktop-file-utils + hicolor-icon-theme ]; + buildInputs = [ - gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme - libgee libgnome-games-support + gtk3 + librsvg + gsound + clutter-gtk + gnome3.adwaita-icon-theme + libgee + libgnome-games-support ]; passthru = { |