From f0688ef3bc4d2603c21d726aacc315bcb1f8d82a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 7 Jun 2011 21:51:13 +0000
Subject: [PATCH] gpsd-2.95

svn path=/nixpkgs/trunk/; revision=27390
---
 pkgs/servers/gpsd/default.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 267665f7a8b3..31c9deaf3af0 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -1,26 +1,25 @@
 { fetchurl, stdenv, pythonPackages, pkgconfig, dbus, dbus_glib
-, ncurses, libX11, libXt, libXpm, libXaw, libXext
+, ncurses, libX11, libXt, libXpm, libXaw, libXext, makeWrapper
+, libusb1, docbook_xml_dtd_412, docbook_xsl, bc
 , libxslt, xmlto, gpsdUser ? "gpsd" }:
 
 stdenv.mkDerivation rec {
-  name = "gpsd-2.39";
+  name = "gpsd-2.95";
 
   src = fetchurl {
     url = "http://download.berlios.de/gpsd/${name}.tar.gz";
-    sha256 = "089ahf97dhws3sk8nc88687h4ny2rlavkzg4wxqkhb0i0fs2yfzf";
+    sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
   };
 
-  buildInputs = [
-    pythonPackages.python pythonPackages.wrapPython
-    pkgconfig dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext
-    libxslt xmlto
-  ];
+  buildNativeInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl
+    xmlto bc pythonPackages.wrapPython ];
 
   pythonPath = [ pythonPackages.curses ];
 
-  configureFlags = "--enable-dbus --enable-gpsd-user=${gpsdUser} "
-    # Make sure `xgpsspeed' has libXt and libX11 in its RPATH.
-    + "LDFLAGS=-Wl,--rpath=${libXt}/lib:${libX11}/lib";
+  buildInputs = [ pythonPackages.python dbus dbus_glib ncurses libX11 libXt
+    libXpm libXaw libXext libxslt libusb1 ];
+
+  configureFlags = "--enable-static --enable-dbus --enable-gpsd-user=${gpsdUser}";
 
   doCheck = true;