From 7f65b99998d6b5ae0e001048c216c444706d8a16 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 30 Jul 2015 10:37:44 +0000 Subject: [PATCH] swell-foop: use wrapGAppsHook --- .../gnome-3/3.16/games/swell-foop/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix index ff3c37c15e6..510e6d6d1a8 100644 --- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper -, clutter, clutter_gtk, intltool, itstool, libxml2 }: +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf +, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { name = "swell-foop-${gnome3.version}.1"; @@ -10,17 +10,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - makeWrapper itstool intltool clutter clutter_gtk libxml2 ]; + dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; enableParallelBuilding = true; - preFixup = '' - wrapProgram "$out/bin/swell-foop" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - ''; - meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME";