From 45a34f65fe143f0e68e74719165d3935ba5731d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Jan 2015 08:59:05 +0100
Subject: [PATCH] meld: drop gnome2.scrollkeeper (no longer used)

Also indent the overlong lines in the expression.
---
 pkgs/applications/version-management/meld/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                       | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d48c50f9daf..36dcb256212 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, scrollkeeper, makeWrapper, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo}:
+{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
+, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
+}:
 
 
 let
@@ -15,7 +17,10 @@ buildPythonPackage rec {
     sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv";
   };
 
-  buildInputs = [ python27 intltool scrollkeeper makeWrapper itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo];
+  buildInputs = [
+    python27 intltool makeWrapper itstool libxml2
+    gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+  ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92330bba833..fb92cebb082 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10474,9 +10474,7 @@ let
 
   mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
 
-  meld = callPackage ../applications/version-management/meld {
-    inherit (gnome) scrollkeeper;
-  };
+  meld = callPackage ../applications/version-management/meld { };
 
   mcomix = callPackage ../applications/graphics/mcomix { };