From 120f8eef67ad725aebdbf439bc90e873a106585e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Dec 2015 03:37:38 +0100
Subject: [PATCH] simple-scan: makeWrapper -> wrapGAppsHook

---
 pkgs/applications/graphics/simple-scan/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 1943d24382a..4b42e27d063 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
-, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
+, libxml2, pkgconfig, saneBackends, systemd, vala, wrapGAppsHook }:
 
 let version = "3.19.2"; in
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
     systemd vala ];
-  nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
+  nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
 
   configureFlags = [ "--disable-packagekit" ];
 
@@ -25,11 +25,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  preFixup = ''
-    wrapProgram "$out/bin/simple-scan" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     inherit version;
     description = "Simple scanning utility";