diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-04-20 17:02:52 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-20 17:40:19 +0200 |
commit | adc65e998d9c8eb3eaca8020fc553bd3d329eef0 (patch) | |
tree | 04e0eec2523bf6d27e6b93d555685b78e22243cc | |
parent | 7029c291c622402dce6bcbe6d58bce4d267ec465 (diff) | |
download | nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar.gz nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar.bz2 nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar.lz nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar.xz nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.tar.zst nixpkgs-adc65e998d9c8eb3eaca8020fc553bd3d329eef0.zip |
uzbl: fix gsettings schemas, fix uzbl-tabbed. Closes #2332
-rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index ba9c8bde37a..81b4f5c01d9 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, makeWrapper +{ stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk , webkit, glib_networking, gsettings_desktop_schemas }: @@ -24,13 +24,16 @@ stdenv.mkDerivation rec { makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out" ''; - postInstall = '' - wrapProgram $out/bin/uzbl-core \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done ''; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ webkit ]; + buildInputs = [ webkit pygtk ]; } |