From ac0daa6dd913bcb146b4829aada5a4dbee4e6a54 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 30 Jul 2015 10:36:07 +0000 Subject: [PATCH] lightsoff: use wrapGAppsHook --- .../gnome-3/3.16/games/lightsoff/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix index 37b8337200d6..313614f1744d 100644 --- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper -, intltool, itstool, clutter, clutter_gtk, libxml2 }: +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: stdenv.mkDerivation rec { name = "lightsoff-${gnome3.version}.1.1"; @@ -9,18 +9,11 @@ stdenv.mkDerivation rec { sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0"; }; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libxml2 clutter clutter_gtk makeWrapper itstool intltool ]; + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf + libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; - preFixup = '' - wrapProgram "$out/bin/lightsoff" \ - --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/Lightsoff; description = "Puzzle game, where the objective is to turn off all of the tiles on the board";