alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

meld: drop gnome2.scrollkeeper (no longer used)

Browse source 
Also indent the overlong lines in the expression.
This commit is contained in:
Vladimír Čunát 2015-01-25 08:59:05 +01:00
parent 88d31f6db0
commit 45a34f65fe
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/version-management/meld/default.nix
View file

@ -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 = ''

4
pkgs/top-level/all-packages.nix
View file

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