From f3eb5950a26b5dd1ddef0f0fdfb43869260baa0a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 1 May 2017 23:41:11 +0200 Subject: xfce4-screenshooter: use wrapGAppsHook instead of makeWrapper --- pkgs/desktops/xfce/applications/xfce4-screenshooter.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops/xfce') diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 5905351e592f..ffcdf4835779 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, makeWrapper, glib_networking, exo, hicolor_icon_theme }: +, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -13,18 +13,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ - pkgconfig intltool makeWrapper + pkgconfig intltool wrapGAppsHook ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme + xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking ]; - preFixup = '' - wrapProgram "$out/bin/xfce4-screenshooter" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" - ''; - meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; -- cgit 1.4.1