uzbl: build with webkitgtk2, cleanup

This commit is contained in:
宋文武 2014-03-30 09:52:36 +08:00
parent d14b9e9850
commit 6e7fe59bb1
2 changed files with 33 additions and 46 deletions

View File

@ -1,45 +1,36 @@
a : { stdenv, fetchurl, pkgconfig, python, makeWrapper
let , webkit, glib_networking, gsettings_desktop_schemas
fetchgit = a.fetchgit; }:
buildInputs = with a; [ stdenv.mkDerivation rec {
libsoup pkgconfig webkit gtk makeWrapper name = "uzbl-20120514";
kbproto glib pango cairo gdk_pixbuf atk
python3 meta = with stdenv.lib; {
]; description = "Tiny externally controllable webkit browser";
in homepage = "http://uzbl.org/";
rec { license = licenses.gpl3;
src = fetchgit { platforms = platforms.linux;
url = "https://github.com/Dieterbe/uzbl.git"; maintainers = with maintainers; [ raskin ];
rev = "refs/tags/2012.05.14";
sha256 = "1crvikb0qqsx5qb003i4w7ywh72psl37gjslrj5hx2fd2f215l0l";
}; };
name = "uzbl-git"; src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
};
inherit buildInputs; preConfigure = ''
configureFlags = []; makeFlags="$makeFlags PREFIX=$out"
makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
/* doConfigure should be removed if not needed */
phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
setVars = a.noDepEntry (''
export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
'');
doWrap = a.makeManyWrappers "$out/bin/uzbl-core"
''
--prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
--prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
''; '';
installFlags = "PREFIX=$out 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"
'';
meta = { nativeBuildInputs = [ pkgconfig python makeWrapper ];
description = "Tiny externally controllable webkit browser";
maintainers = [a.lib.maintainers.raskin]; buildInputs = [ webkit ];
};
} }

View File

@ -9162,12 +9162,8 @@ let
uwimap = callPackage ../tools/networking/uwimap { }; uwimap = callPackage ../tools/networking/uwimap { };
uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { uzbl = callPackage ../applications/networking/browsers/uzbl {
inherit pkgconfig webkit makeWrapper glib_networking python3; webkit = webkitgtk2;
inherit glib pango cairo gdk_pixbuf atk;
inherit (xlibs) libX11 kbproto;
inherit (gnome) libsoup;
gtk = gtk3;
}; };
vanitygen = callPackage ../applications/misc/vanitygen { }; vanitygen = callPackage ../applications/misc/vanitygen { };