diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-09 12:02:33 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-24 22:28:02 +0100 |
commit | 4443198adfb7a072024bcb5af22012824890f5b1 (patch) | |
tree | 69f47add36f228508a96867e969b6323d4c45eb5 /pkgs | |
parent | 8b3d725cc3fce49fad81290d94a7e07900900b12 (diff) |
gpsd: use python2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/gpsd/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b8d2498b71ea2..7670c89f0c6a9 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -2,7 +2,7 @@ , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" -, pythonPackages +, python2Packages }: # TODO: put the X11 deps behind a guiSupport parameter for headless support @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc - pythonPackages.python - pythonPackages.wrapPython + python2Packages.python + python2Packages.wrapPython ]; buildInputs = [ - pythonPackages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext + python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext libxslt libusb1 ]; pythonPath = [ - pythonPackages.pygobject2 - pythonPackages.pygtk + python2Packages.pygobject2 + python2Packages.pygtk ]; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { 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/${pythonPackages.python.libPrefix}/site-packages" + python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; checkPhase = '' |