Author: raskin
Date: Sun Jan 2 13:23:59 2011
New Revision: 25335
URL: https://svn.nixos.org/websvn/nix/?rev=25335&sc=1
Log:
Adding geoclue - as framework only, feel free to build it with proper data
providers if you have a reason for that
Added:
nixpkgs/trunk/pkgs/development/libraries/geoclue/
nixpkgs/trunk/pkgs/development/libraries/geoclue/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix
nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/geoclue/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/geoclue/default.nix Sun Jan
2 13:23:59 2011 (r25335)
@@ -0,0 +1,49 @@
+...@{builderdefspackage
+ , dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ ["gnome"];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames))
+ ++ [gnome.GConf];
+ sourceInfo = rec {
+ baseName="geoclue";
+ version="0.12.0";
+ name="${baseName}-${version}";
+ url="http://folks.o-hand.com/jku/geoclue-releases/${name}.tar.gz";;
+ hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Geolocation framework and some data providers";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.lglp2;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";;
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix Sun Jan 2
11:05:46 2011 (r25334)
+++ nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix Sun Jan 2
13:23:59 2011 (r25335)
@@ -13,7 +13,7 @@
gettext libjpeg libpng libtiff libxml2 libxslt pango
sqlite icu gperf bison flex autoconf automake libtool
perl intltool pkgconfig libsoup gtkdoc libXt libproxy
- enchant python ruby which renderproto libXrender
+ enchant python ruby which renderproto libXrender geoclue
];
propagatedBuildInputs = [
@@ -27,21 +27,28 @@
"--enable-web-timing"
"--enable-image-resizer"
+ "--enable-geolocation"
+
+ # Not implemented?
+ # "--enable-web-audio"
+
"--enable-mathml"
# https://bugs.webkit.org/show_bug.cgi?id=42943
- # "--enable-wml"
+ # FIXED
+ "--enable-wml"
# https://bugs.webkit.org/show_bug.cgi?id=45110
# "--enable-indexed-database"
# Related bug is marked as closed, but seems to persist
- # "--enable-xhtmlmp"
+ "--enable-xhtmlmp"
# "--enable-input-speech"
# https://bugs.webkit.org/show_bug.cgi?id=43878
- # "--enable-file-writer"
+ # Related bug FIXED
+ "--enable-file-writer"
# "--enable-blob"
# May be or not be triggering
https://bugs.webkit.org/show_bug.cgi?id=43878
Modified: nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix Sun Jan
2 11:05:46 2011 (r25334)
+++ nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix Sun Jan
2 13:23:59 2011 (r25335)
@@ -1,9 +1,9 @@
rec {
- version="r70732";
- name="webkit-r70732";
- hash="1y81rir7mwqxd40i4zzq79c7wa0pvvgvk332k1j94xwqfrffnxzi";
-
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2";;
-
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2";;
+ version="r74228";
+ name="webkit-r74228";
+ hash="1vwh72zzvj2p9lrs847wmcxgpjl2411blfk6ry3wczcdwg712a46";
+
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r74228.tar.bz2";;
+
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r74228.tar.bz2";;
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 2 11:05:46
2011 (r25334)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 2 13:23:59
2011 (r25335)
@@ -2970,6 +2970,8 @@
inherit (gtkLibs) pango glib gtk;
};
+ geoclue = callPackage ../development/libraries/geoclue {};
+
geoip = builderDefsPackage ../development/libraries/geoip {
inherit zlib;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
