From a0d41635ee4c46031c857f6b61f4b3f80261a8fa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 14 Mar 2018 06:11:34 +0100 Subject: [PATCH] gnome3.gnome-mines: fix build --- .../gnome-3/games/gnome-mines/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 920828a20e6..55dad369c10 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, libgames-support, libgee }: +{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, gettext, itstool, libxml2, libgames-support, libgee }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; @@ -10,15 +10,21 @@ stdenv.mkDerivation rec { sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; }; - }; + # gobjectIntrospection for finding vapi files + nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; + buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme libgames-support libgee - ]; + postPatch = '' + chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file + patchShebangs data/meson_compile_gschema.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-mines"; + attrPath = "gnome3.gnome-mines"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mines;