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 { };