From adc65e998d9c8eb3eaca8020fc553bd3d329eef0 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 20 Apr 2014 17:02:52 +0200 Subject: [PATCH] uzbl: fix gsettings schemas, fix uzbl-tabbed. Closes #2332 --- .../networking/browsers/uzbl/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index ba9c8bde37a2..81b4f5c01d9a 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 ]; }