@@ -1,40 +1,71 @@
1−{ stdenv, lib ,fetchurl, scons, pkg-config, dbus, ncurses
2−, libusb1, docbook_xml_dtd_412, docbook_xsl, bc
1+{ stdenv
2+, lib
3+, fetchurl
4+
5+# nativeBuildInputs
6+, scons
7+, pkg-config
8+
9+# buildInputs
10+, dbus
11+, libusb1
12+, ncurses
13+, pps-tools
14+, python3Packages
315
416# optional deps for GUI packages
517, guiSupport ? true
6−, dbus-glib ? null, libX11 ? null, libXt ? null, libXpm ? null, libXaw ? null, libXext ? null
7−, gobject-introspection ? null, pango ? null, gdk-pixbuf ? null, atk ? null, wrapGAppsHook ? null
8−
9−, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
10−, pps-tools
11−, python3Packages
18+, dbus-glib ? null
19+, libX11 ? null
20+, libXt ? null
21+, libXpm ? null
22+, libXaw ? null
23+, libXext ? null
24+, gobject-introspection ? null
25+, pango ? null
26+, gdk-pixbuf ? null
27+, atk ? null
28+, wrapGAppsHook ? null
29+
30+, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
1231}:
1332
14−
1533stdenv.mkDerivation rec {
1634 pname = "gpsd";
17− version = "3.22";
35+ version = "3.23";
1836
1937 src = fetchurl {
2038 url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
21− sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq";
39+ sha256 = "sha256-UiwjYqfrLXrDfqoVBPEq3tHDc0eah7oGzGeVl0tWe7w=";
2240 };
2341
42+ # TODO: render & install HTML documentation using asciidoctor
2443 nativeBuildInputs = [
25− scons pkg-config docbook_xml_dtd_412 docbook_xsl xmlto bc
26− python3Packages.python
44+ pkg-config
2745 python3Packages.wrapPython
28− ]
29− ++ lib.optionals guiSupport [ wrapGAppsHook gobject-introspection ];
46+ scons
47+ ] ++ lib.optionals guiSupport [
48+ gobject-introspection
49+ wrapGAppsHook
50+ ];
3051
3152 buildInputs = [
32− python3Packages.python dbus ncurses
33− libxslt libusb1 pps-tools
34− ]
35− ++ lib.optionals guiSupport [
36− dbus-glib libX11 libXt libXpm libXaw libXext
37− gobject-introspection pango gdk-pixbuf atk
53+ dbus
54+ libusb1
55+ ncurses
56+ pps-tools
57+ python3Packages.python
58+ ] ++ lib.optionals guiSupport [
59+ atk
60+ dbus-glib
61+ gdk-pixbuf
62+ gobject-introspection
63+ libX11
64+ libXaw
65+ libXext
66+ libXpm
67+ libXt
68+ pango
3869 ];
3970
4071 pythonPath = lib.optionals guiSupport [
@@ -46,8 +77,6 @@ stdenv.mkDerivation rec {
4677 ./sconstruct-env-fixes.patch
4778 ];
4879
49− # - leapfetch=no disables going online at build time to fetch leap-seconds
50− # info. See <gpsd-src>/build.txt for more info.
5180 preBuild = ''
5281 patchShebangs .
5382 sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript
@@ -57,6 +86,8 @@ stdenv.mkDerivation rec {
5786 sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages"
5887 '';
5988
89+ # - leapfetch=no disables going online at build time to fetch leap-seconds
90+ # info. See <gpsd-src>/build.txt for more info.
6091 sconsFlags = [
6192 "leapfetch=no"
6293 "gpsd_user=${gpsdUser}"
@@ -73,6 +104,7 @@ stdenv.mkDerivation rec {
73104 preInstall = ''
74105 mkdir -p "$out/lib/udev/rules.d"
75106 '';
107+
76108 installTargets = [ "install" "udev-install" ];
77109
78110 # remove binaries for x-less install because xgps sconsflag is partially broken
@@ -103,7 +135,7 @@ stdenv.mkDerivation rec {
103135 '';
104136 homepage = "https://gpsd.gitlab.io/gpsd/index.html";
105137 changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS";
106− license = licenses.bsd3;
138+ license = licenses.bsd2;
107139 platforms = platforms.linux;
108140 maintainers = with maintainers; [ bjornfor rasendubi ];
109141 };