From 83251cdd60485d8c55d7ba6cc21d9f63dc6167f8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 30 Jul 2016 09:46:18 +0200
Subject: meld: 3.16.1 -> 3.16.2

---
 pkgs/applications/version-management/meld/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'pkgs/applications/version-management/meld')

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 3da377414d411..99e45438984d0 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper
-, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
+{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook
+, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file
 }:
 
 
 let
   minor = "3.16";
-  version = "${minor}.1";
+  version = "${minor}.2";
 in
 
 buildPythonApplication rec {
@@ -14,13 +14,13 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab";
+    sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f";
   };
 
   buildInputs = [
-    python27 intltool makeWrapper itstool libxml2
+    python27 intltool wrapGAppsHook itstool libxml2
     gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
-    gnome3.defaultIconTheme
+    gnome3.defaultIconTheme gnome3.dconf file
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
@@ -37,13 +37,6 @@ buildPythonApplication rec {
     mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/
   '';
 
-  preFixup = ''
-    wrapProgram $out/bin/meld \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-  '';
-
   patchPhase = ''
     patchShebangs bin/meld
   '';
-- 
cgit 1.4.1