Updating vimprobable2 to 1.0.0

I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
This commit is contained in:
Lluís Batlle i Rossell 2012-04-04 21:30:49 +00:00
parent dd822c7ece
commit 5d15ef0e7c
3 changed files with 10 additions and 8 deletions

View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
glib_networking}:
{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit }:
stdenv.mkDerivation {
name = "vimprobable2-0.9.12.0";
name = "vimprobable2-1.0.0";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2";
sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn";
};
buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
@ -28,8 +28,8 @@ stdenv.mkDerivation {
being completely featureless.
'';
homepage = "http://sourceforge.net/apps/trac/vimprobable";
license = "MIT";
maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
};
}

View File

@ -4,6 +4,7 @@
/* Add your name and email address here. Keep the list
alphabetically sorted. */
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";

View File

@ -8608,6 +8608,7 @@ let
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
inherit (gnome) libsoup;
webkit = webkit_gtk2;
};
vimprobable2Wrapper = wrapFirefox