dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

meld: 3.12.3 -> 3.14.0 (close #8982)

Browse Source
This commit is contained in:
Vincent Laporte 2015-07-24 19:03:11 +02:00 committed by Vladimír Čunát
parent c8ee2af804
commit 9d5508d85c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/version-management/meld/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper { stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
, hicolor_icon_theme
}: }:
let let
minor = "3.12"; minor = "3.14";
version = "${minor}.3"; version = "${minor}.0";
in in
buildPythonPackage rec { buildPythonPackage rec {
@ -15,13 +14,13 @@ buildPythonPackage rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv"; sha256 = "0g0h9wdr6nqdalqkz4r037569apw253cklwr17x0zjc7nwv2j3j3";
}; };
buildInputs = [ buildInputs = [
python27 intltool makeWrapper itstool libxml2 python27 intltool makeWrapper itstool libxml2
gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
hicolor_icon_theme gnome3.defaultIconTheme
]; ];
propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
@ -41,18 +40,19 @@ buildPythonPackage rec {
preFixup = '' preFixup = ''
wrapProgram $out/bin/meld \ wrapProgram $out/bin/meld \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --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 = '' patchPhase = ''
sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld patchShebangs bin/meld
''; '';
pythonPath = [ gtk3 ]; pythonPath = [ gtk3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Visual diff and merge tool"; description = "Visual diff and merge tool";
homepage = http://meld.sourceforge.net; homepage = http://meldmerge.org/;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux ++ stdenv.lib.platforms.darwin; platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
}; };