Merge pull request #13611 from dgonyeo/master

uzbl: version 20120514 -> v0.9.0

+10 -8
+10 -8
pkgs/applications/networking/browsers/uzbl/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk 2 - , webkit, glib_networking, gsettings_desktop_schemas 3 }: 4 5 stdenv.mkDerivation rec { 6 - name = "uzbl-20120514"; 7 8 meta = with stdenv.lib; { 9 description = "Tiny externally controllable webkit browser"; 10 homepage = "http://uzbl.org/"; 11 license = licenses.gpl3; 12 platforms = platforms.linux; 13 - maintainers = with maintainers; [ raskin ]; 14 }; 15 16 src = fetchurl { 17 name = "${name}.tar.gz"; 18 - url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz"; 19 - sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn"; 20 }; 21 22 preConfigure = '' 23 makeFlags="$makeFlags PREFIX=$out" 24 makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out" 25 ''; 26 27 preFixup = '' ··· 33 done 34 ''; 35 36 - nativeBuildInputs = [ pkgconfig python makeWrapper ]; 37 38 - buildInputs = [ gsettings_desktop_schemas webkit pygtk ]; 39 }
··· 1 + { stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk 2 + , webkit, glib_networking, gsettings_desktop_schemas, pythonPackages 3 }: 4 5 stdenv.mkDerivation rec { 6 + name = "uzbl-v0.9.0"; 7 8 meta = with stdenv.lib; { 9 description = "Tiny externally controllable webkit browser"; 10 homepage = "http://uzbl.org/"; 11 license = licenses.gpl3; 12 platforms = platforms.linux; 13 + maintainers = with maintainers; [ raskin dgonyeo ]; 14 }; 15 16 src = fetchurl { 17 name = "${name}.tar.gz"; 18 + url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz"; 19 + sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k"; 20 }; 21 22 preConfigure = '' 23 makeFlags="$makeFlags PREFIX=$out" 24 makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out" 25 + mkdir -p $out/lib/python3.4/site-packages/ 26 + export PYTHONPATH=$PYTHONPATH:$out/lib/python3.4/site-packages/ 27 ''; 28 29 preFixup = '' ··· 35 done 36 ''; 37 38 + nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; 39 40 + buildInputs = [ gsettings_desktop_schemas webkit pygtk pythonPackages.six ]; 41 }