diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-25 08:59:05 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-25 08:59:05 +0100 |
| commit | 45a34f65fe143f0e68e74719165d3935ba5731d4 (patch) | |
| tree | 6d4db950f8ffdc89ca3ee7bd4badce329c8a8c83 /pkgs | |
| parent | 88d31f6db01ad2ed98f6a826f76c1e499a31bb25 (diff) | |
| download | nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar.gz nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar.bz2 nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar.lz nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar.xz nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.tar.zst nixlib-45a34f65fe143f0e68e74719165d3935ba5731d4.zip | |
meld: drop gnome2.scrollkeeper (no longer used)
Also indent the overlong lines in the expression.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 9 | ||||
| -rw-r--r-- | 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 d48c50f9daf8..36dcb2562121 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 92330bba8334..fb92cebb0822 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 { }; |