diff options
| author | Richard Marko <srk@48.io> | 2018-07-04 13:28:07 +0200 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-07-04 11:28:07 +0000 |
| commit | 91575dd285efcd75d7e09a94ef619bf4a6bc4bd2 (patch) | |
| tree | 4207a0bc7a32c9c1f9486be373724859cd7ce6f9 /pkgs/servers/gpsd | |
| parent | 45f8c2ac29c28060d284318baf0565c13b2b131f (diff) | |
| download | nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.gz nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.bz2 nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.lz nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.xz nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.zst nixpkgs-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.zip | |
pps-tools: init at 1.0.2, enable for chrony, gpsd, ntp (#42889)
Diffstat (limited to 'pkgs/servers/gpsd')
| -rw-r--r-- | pkgs/servers/gpsd/0002-scons-envs-patch.patch | 11 | ||||
| -rw-r--r-- | pkgs/servers/gpsd/default.nix | 17 |
2 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/pkgs/servers/gpsd/0002-scons-envs-patch.patch new file mode 100644 index 00000000000..fbb06db6aa3 --- /dev/null +++ b/pkgs/servers/gpsd/0002-scons-envs-patch.patch @@ -0,0 +1,11 @@ +--- b/SConstruct 2018-07-03 23:13:51.986746857 +0200 ++++ a/SConstruct 2018-07-03 23:14:50.495252914 +0200 +@@ -221,7 +221,7 @@ + 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. + ) +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 911f3b23f0c..6e270192063 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -2,6 +2,7 @@ , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" +, pps-tools , python2Packages }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext - libxslt libusb1 + libxslt libusb1 pps-tools ]; pythonPath = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { # TODO: remove the patch with the next release ./0001-Use-pkgconfig-for-dbus-library.patch + # to be able to find pps-tools + ./0002-scons-envs-patch.patch ]; # - leapfetch=no disables going online at build time to fetch leap-seconds @@ -44,9 +47,15 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct - scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ - systemd=yes udevdir="$out/lib/udev" \ - python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" + scons \ + -j $NIX_BUILD_CORES \ + prefix="$out" \ + leapfetch=no \ + gpsd_user=${gpsdUser} \ + gpsd_group=${gpsdGroup} \ + systemd=yes \ + udevdir="$out/lib/udev" \ + python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; checkPhase = '' |