From dd791a42815761a68071b366ecc2cef2cae56c45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Mar 2018 01:42:20 +0100 Subject: [PATCH] gnome3.swell-foop: fix build --- .../gnome-3/games/swell-foop/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 90357c9d80c..13b6f57d0fd 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "swell-foop-${version}"; +let + pname = "swell-foop"; version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; }; + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ]; + nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Swell%20Foop;