diff options
author | 宋文武 <iyzsong@gmail.com> | 2014-03-30 09:52:36 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2014-03-30 09:52:36 +0800 |
commit | 6e7fe59bb13a2e3bf05516c559fbf4272a0331d0 (patch) | |
tree | 70f8d1ad588bc53cc922233829c793265a166ab7 /pkgs | |
parent | d14b9e9850b300208a0ab2d4387addf555273012 (diff) | |
download | nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar.gz nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar.bz2 nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar.lz nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar.xz nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.tar.zst nixlib-6e7fe59bb13a2e3bf05516c559fbf4272a0331d0.zip |
uzbl: build with webkitgtk2, cleanup
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 65 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 30 insertions, 43 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 4c6458d909fd..ba9c8bde37a2 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,45 +1,36 @@ -a : -let - fetchgit = a.fetchgit; +{ stdenv, fetchurl, pkgconfig, python, makeWrapper +, webkit, glib_networking, gsettings_desktop_schemas +}: - buildInputs = with a; [ - libsoup pkgconfig webkit gtk makeWrapper - kbproto glib pango cairo gdk_pixbuf atk - python3 - ]; -in -rec { - src = fetchgit { - url = "https://github.com/Dieterbe/uzbl.git"; - rev = "refs/tags/2012.05.14"; - sha256 = "1crvikb0qqsx5qb003i4w7ywh72psl37gjslrj5hx2fd2f215l0l"; - }; +stdenv.mkDerivation rec { + name = "uzbl-20120514"; - name = "uzbl-git"; + meta = with stdenv.lib; { + description = "Tiny externally controllable webkit browser"; + homepage = "http://uzbl.org/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; + }; - inherit buildInputs; - configureFlags = []; + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz"; + sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"]; + preConfigure = '' + makeFlags="$makeFlags PREFIX=$out" + makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out" + ''; - setVars = a.noDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11" - ''); + 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" + ''; - 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 - ''; + nativeBuildInputs = [ pkgconfig python makeWrapper ]; - installFlags = "PREFIX=$out PYINSTALL_EXTRA=\"--prefix=$out\""; - - meta = { - description = "Tiny externally controllable webkit browser"; - maintainers = [a.lib.maintainers.raskin]; - }; + buildInputs = [ webkit ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31456b94cbda..6aec2cf19a29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9162,12 +9162,8 @@ let uwimap = callPackage ../tools/networking/uwimap { }; - uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper glib_networking python3; - inherit glib pango cairo gdk_pixbuf atk; - inherit (xlibs) libX11 kbproto; - inherit (gnome) libsoup; - gtk = gtk3; + uzbl = callPackage ../applications/networking/browsers/uzbl { + webkit = webkitgtk2; }; vanitygen = callPackage ../applications/misc/vanitygen { }; |