diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2016-03-02 07:54:12 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2016-03-02 07:54:12 +0000 |
commit | 999bf7c9c710486b8a92cf8998c385fbc64ac762 (patch) | |
tree | 32054e0eddffbc05ed9adec20cf59fae28dc0f91 | |
parent | a429444a75f0ece433b6653b2f82a4876f8b07c8 (diff) | |
parent | f681ceb5935ac8688b9d707b92c49fdf8ca589b3 (diff) | |
download | nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar.gz nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar.bz2 nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar.lz nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar.xz nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.tar.zst nixpkgs-999bf7c9c710486b8a92cf8998c385fbc64ac762.zip |
Merge pull request #13611 from dgonyeo/master
uzbl: version 20120514 -> v0.9.0
-rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 318b9576392..9e3b44f4083 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -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 ]; } |