Author: raskin
Date: Wed Mar 21 19:14:34 2012
New Revision: 33340
URL: https://nixos.org/websvn/nix/?rev=33340&sc=1
Log:
Update/fix Uzbl
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/default.nix
Wed Mar 21 17:49:54 2012 (r33339)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/uzbl/default.nix
Wed Mar 21 19:14:34 2012 (r33340)
@@ -1,17 +1,20 @@
a :
let
- fetchurl = a.fetchurl;
-
- s = import ./src-for-default.nix;
+ fetchgit = a.fetchgit;
buildInputs = with a; [
- libsoup pkgconfig webkit gtk makeWrapper
+ libsoup pkgconfig webkit gtk3 makeWrapper
kbproto
];
in
rec {
- src = (a.fetchUrlFromSrcInfo s);
- inherit (s) name;
+ src = fetchgit {
+ url = "https://github.com/Dieterbe/uzbl.git";;
+ rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08";
+ sha256 =
"f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468";
+ };
+
+ name = "uzbl-git";
inherit buildInputs;
configureFlags = [];
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Wed Mar
21 17:49:54 2012 (r33339)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Wed Mar
21 19:14:34 2012 (r33340)
@@ -7411,7 +7411,7 @@
uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
inherit pkgconfig webkit makeWrapper glib_networking;
- inherit gtk glib;
+ inherit gtk3 glib;
inherit (xlibs) libX11 kbproto;
inherit (gnome) libsoup;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
