public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meld: bump to 3.12.3 (latest) version

Browse Source
This commit is contained in:
Joachim Schiele 2015-01-21 20:59:57 +01:00
parent 7edbd7ad19
commit b8c2f466ba
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +1,48 @@
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: {stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, scrollkeeper, makeWrapper, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo}:
let let
minor = "1.8"; minor = "3.12";
version = "${minor}.6"; version = "${minor}.3";
in in
stdenv.mkDerivation { buildPythonPackage rec {
name = "meld-${version}"; name = "meld-${version}";
namePrefix = "";
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 = "19g86rksrs77hd58zhs3zwbjmmhqc98v2ly8451avwsbiwmni5mg"; sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv";
}; };
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; buildInputs = [ python27 intltool scrollkeeper makeWrapper itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo];
propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
installPhase = ''
mkdir -p "$out/lib/${python27.libPrefix}/site-packages"
export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH"
${python27}/bin/${python27.executable} setup.py install \
--install-lib=$out/lib/${python27.libPrefix}/site-packages \
--prefix="$out"
wrapProgram $out/bin/meld \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
'';
patchPhase = '' patchPhase = ''
sed -e s,/usr/local,$out, -i INSTALL sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld
sed -e 's,#!.*,#!${python}/bin/python,' -i bin/meld
''; '';
postInstall = '' pythonPath = [ gtk3 ];
wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
'';
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://meld.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux ++ stdenv.lib.platforms.darwin; platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
}; };
} }

3
pkgs/development/python-modules/pygobject/3.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys"; sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys";
}; };
buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ]; buildInputs = [ python pkgconfig glib gobjectIntrospection ];
propagatedBuildInputs = [ pycairo cairo ];
meta = { meta = {
homepage = http://live.gnome.org/PyGObject; homepage = http://live.gnome.org/PyGObject;

1
pkgs/top-level/all-packages.nix
View File

@ -10440,7 +10440,6 @@ let
meld = callPackage ../applications/version-management/meld { meld = callPackage ../applications/version-management/meld {
inherit (gnome) scrollkeeper; inherit (gnome) scrollkeeper;
pygtk = pyGtkGlade;
}; };
mcomix = callPackage ../applications/graphics/mcomix { }; mcomix = callPackage ../applications/graphics/mcomix { };