Merge pull request #13611 from dgonyeo/master

uzbl: version 20120514 -> v0.9.0
This commit is contained in:
Michael Raskin 2016-03-02 07:54:12 +00:00
commit 999bf7c9c7

View file

@ -1,27 +1,29 @@
{ stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk
, webkit, glib_networking, gsettings_desktop_schemas
{ stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk
, webkit, glib_networking, gsettings_desktop_schemas, pythonPackages
}:
stdenv.mkDerivation rec {
name = "uzbl-20120514";
name = "uzbl-v0.9.0";
meta = with stdenv.lib; {
description = "Tiny externally controllable webkit browser";
homepage = "http://uzbl.org/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ raskin dgonyeo ];
};
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz";
sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
};
preConfigure = ''
makeFlags="$makeFlags PREFIX=$out"
makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
mkdir -p $out/lib/python3.4/site-packages/
export PYTHONPATH=$PYTHONPATH:$out/lib/python3.4/site-packages/
'';
preFixup = ''
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
done
'';
nativeBuildInputs = [ pkgconfig python makeWrapper ];
nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
buildInputs = [ gsettings_desktop_schemas webkit pygtk ];
buildInputs = [ gsettings_desktop_schemas webkit pygtk pythonPackages.six ];
}