diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-06 19:39:29 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-06 19:39:29 +0000 |
| commit | 3c2c4ac87a11b6b522dc69663d373a3c6349dbf1 (patch) | |
| tree | 76dc2b0a1c9930ec59fb1e6ae87516714b63142a | |
| parent | 788e40bd5a3434d859e0b937aa0c9c3b40519adf (diff) | |
| download | nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar.gz nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar.bz2 nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar.lz nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar.xz nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.tar.zst nixlib-3c2c4ac87a11b6b522dc69663d373a3c6349dbf1.zip | |
Adding 'meld'
svn path=/nixpkgs/trunk/; revision=20963
| -rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix new file mode 100644 index 000000000000..9a4c58d11c48 --- /dev/null +++ b/pkgs/applications/version-management/meld/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: + +stdenv.mkDerivation { + name = "meld-1.3.1"; + + src = fetchurl { + url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2; + sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn"; + }; + + buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; + + patchPhase = '' + sed -e s,/usr/local,$out, -i INSTALL + sed -e 's,#!.*,#!${python}/bin/python,' -i meld + ''; + + postInstall = '' + wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0 + ''; + + meta = { + description = "Visual diff and merge tool"; + homepage = http://meld.sourceforge.net; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f34c4f6fc534..2fb62c64dbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7686,6 +7686,12 @@ let qt = qt4; }; + meld = import ../applications/version-management/meld { + inherit fetchurl stdenv python intltool makeWrapper; + inherit (gnome) scrollkeeper; + pygtk = pyGtkGlade; + }; + mercurial = import ../applications/version-management/mercurial { inherit fetchurl stdenv makeWrapper getConfig tk; guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) |