summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2015-07-30 10:36:07 +0000
committerLuca Bruno <lucabru@src.gnome.org>2015-07-30 10:45:04 +0000
commitac0daa6dd913bcb146b4829aada5a4dbee4e6a54 (patch)
tree572a78a038a13fc8a51d4eba352ffe4b6c652a2a /pkgs
parent13d2056cbf18248730f238475b5f55f62066d78c (diff)
downloadnixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar.gz
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar.bz2
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar.lz
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar.xz
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.tar.zst
nixlib-ac0daa6dd913bcb146b4829aada5a4dbee4e6a54.zip
lightsoff: use wrapGAppsHook
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix15
1 files 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";