diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-07-24 19:03:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-25 13:10:24 +0200 |
| commit | 9d5508d85c33b8fb22d79dde6176792eac2c2696 (patch) | |
| tree | b2212a623cd1d61bf865a0585ba34ebfa86891a9 /pkgs/applications/version-management/meld | |
| parent | c8ee2af8047727919e7de4b135a4a86837e75958 (diff) | |
meld: 3.12.3 -> 3.14.0 (close #8982)
Diffstat (limited to 'pkgs/applications/version-management/meld')
| -rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 2a69d1406699..2f7c4af0024f 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo -, hicolor_icon_theme }: let - minor = "3.12"; - version = "${minor}.3"; + minor = "3.14"; + version = "${minor}.0"; in buildPythonPackage rec { @@ -15,13 +14,13 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv"; + sha256 = "0g0h9wdr6nqdalqkz4r037569apw253cklwr17x0zjc7nwv2j3j3"; }; buildInputs = [ python27 intltool makeWrapper itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo - hicolor_icon_theme + gnome3.defaultIconTheme ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; @@ -41,18 +40,19 @@ buildPythonPackage rec { preFixup = '' wrapProgram $out/bin/meld \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; patchPhase = '' - sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld + patchShebangs bin/meld ''; pythonPath = [ gtk3 ]; meta = with stdenv.lib; { description = "Visual diff and merge tool"; - homepage = http://meld.sourceforge.net; + homepage = http://meldmerge.org/; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux ++ stdenv.lib.platforms.darwin; }; |