geoclue: reimplement using mkDerivation

1 files changed, 17 insertions, 42 deletions

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 4c5d17eca997..1b703e2fdba8 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,55 +1,30 @@
-x@{builderDefsPackage
-  , dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["gnome"];
+{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt }:
 
-  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="https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
-    hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "geoclue-0.12.0";
+  src = fetchurl {
+    url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
+    sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ pkgconfig libxml2 gnome.GConf libxslt ];
 
-  propagatedBuildInputs = [a.dbus a.glib a.dbus_glib];
+  propagatedBuildInputs = [dbus glib dbus_glib];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixConfigure" "doConfigure" "doMakeInstall"];
-      
-  fixConfigure = a.fullDepEntry ''
-    sed -e 's@-Werror@@' -i configure
-  '' ["minInit" "doUnpack"];
+  preConfigure = ''
+    sed -e '/-Werror/d' -i configure
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl2;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";
     };
   };
-}) x
-
+}