public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpsd: Fix client programs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15812
This commit is contained in:
Ludovic Courtès 2009-06-01 00:03:08 +00:00
parent b179d2c480
commit e0586a7936
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/servers/gpsd/default.nix
View File

@ -1,5 +1,6 @@
{ fetchurl, stdenv, python, pkgconfig, dbus, dbus_glib { fetchurl, stdenv, python, pkgconfig, dbus, dbus_glib
, ncurses, libXt, libXpm, libxslt, xmlto, gpsdUser ? "gpsd" }: , ncurses, libX11, libXt, libXpm, libXaw, libXext, makeWrapper
, libxslt, xmlto, gpsdUser ? "gpsd" }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpsd-2.39"; name = "gpsd-2.39";
@ -10,14 +11,31 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
python pkgconfig dbus dbus_glib ncurses libXt libXpm python pkgconfig dbus dbus_glib ncurses
libxslt xmlto libX11 libXt libXpm libXaw libXext
makeWrapper libxslt xmlto
]; ];
configureFlags = "--enable-dbus --enable-gpsd-user=${gpsdUser}"; configureFlags = "--enable-dbus --enable-gpsd-user=${gpsdUser} "
# Make sure `xgpsspeed' has libXt and libX11 in its RPATH.
+ "LDFLAGS=-Wl,--rpath=${libXt}/lib:${libX11}/lib";
doCheck = true; doCheck = true;
postInstall = ''
for prog in "$out/bin"/*
do
if grep -q python "$prog"
then
echo "patching \`$prog'..."
wrapProgram "$prog" \
--prefix PATH ":" "${python}/bin" \
--prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages"
fi
done
'';
meta = { meta = {
description = "`gpsd', a GPS service daemon"; description = "`gpsd', a GPS service daemon";

10
pkgs/top-level/all-packages.nix
View File

@ -2228,6 +2228,7 @@ let
}; };
python25Full = python25Base.passthru.function { python25Full = python25Base.passthru.function {
# FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
db4 = if getConfig ["python" "db4Support"] true then db4 else null; db4 = if getConfig ["python" "db4Support"] true then db4 else null;
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
readline = if getConfig ["python" "readlineSupport"] true then readline else null; readline = if getConfig ["python" "readlineSupport"] true then readline else null;
@ -6328,9 +6329,12 @@ let
}; };
gpsd = import ../servers/gpsd { gpsd = import ../servers/gpsd {
inherit fetchurl stdenv python pkgconfig dbus dbus_glib inherit fetchurl stdenv pkgconfig dbus dbus_glib
ncurses libxslt xmlto; ncurses makeWrapper libxslt xmlto;
inherit (xlibs) libXt libXpm; inherit (xlibs) libX11 libXt libXpm libXaw libXext;
# We need a Python with NCurses bindings.
python = pythonFull;
}; };
gv = import ../applications/misc/gv { gv = import ../applications/misc/gv {