1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00

Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Sander van der Burg 2013-07-08 11:15:17 +02:00
commit dadb72b7a0
2 changed files with 33 additions and 0 deletions

View file

@ -0,0 +1,31 @@
{ stdenv, fetchurl, python, pygtk, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.4.7";
name = "diffuse-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
};
buildInputs = [ python pygtk makeWrapper ];
buildPhase = ''
python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
'';
# no-op, everything is done in buildPhase
installPhase = "true";
# NOTE: diffuse installs a .desktop file itself
meta = with stdenv.lib; {
description = "Graphical diff and merge tool";
homepage = http://diffuse.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

View file

@ -7207,6 +7207,8 @@ let
inherit (pkgs.gnome) libart_lgpl libgnomeui;
};
diffuse = callPackage ../applications/version-management/diffuse { };
distrho = callPackage ../applications/audio/distrho {};
djvulibre = callPackage ../applications/misc/djvulibre { };