diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-11-08 10:34:06 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-11-08 10:34:06 +0400 |
| commit | c2bc48aef38385fda0c68417cc4fc9c97adf365e (patch) | |
| tree | 5fc93d426b52e1f01ddd6964896c964f0f4422aa | |
| parent | 123c3f91a369b53a652522d8e43e76f009aafeae (diff) | |
| download | nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar.gz nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar.bz2 nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar.lz nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar.xz nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.tar.zst nixlib-c2bc48aef38385fda0c68417cc4fc9c97adf365e.zip | |
Update Uzbl
| -rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index b85ad0e085eb..4c6458d909fd 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -3,15 +3,16 @@ let fetchgit = a.fetchgit; buildInputs = with a; [ - libsoup pkgconfig webkit gtk3 makeWrapper - kbproto + 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 = "dcb3b4e1fcff682b412cfe5875f7054b97380d08"; - sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468"; + rev = "refs/tags/2012.05.14"; + sha256 = "1crvikb0qqsx5qb003i4w7ywh72psl37gjslrj5hx2fd2f215l0l"; }; name = "uzbl-git"; @@ -35,7 +36,7 @@ rec { --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules ''; - installFlags = "PREFIX=$out"; + installFlags = "PREFIX=$out PYINSTALL_EXTRA=\"--prefix=$out\""; meta = { description = "Tiny externally controllable webkit browser"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfd1adcf2290..6ca5c7e4d95b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7829,10 +7829,11 @@ let uwimap = callPackage ../tools/networking/uwimap { }; uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper glib_networking; - inherit gtk3 glib; + inherit pkgconfig webkit makeWrapper glib_networking python3; + inherit glib pango cairo gdk_pixbuf atk; inherit (xlibs) libX11 kbproto; inherit (gnome) libsoup; + gtk = gtk3; }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; |