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

gpsd: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-11-09 12:02:33 +01:00
parent 8b3d725cc3
commit 4443198adf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, ncurses, libX11, libXt, libXpm, libXaw, libXext , ncurses, libX11, libXt, libXpm, libXaw, libXext
, libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libusb1, docbook_xml_dtd_412, docbook_xsl, bc
, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
, pythonPackages , python2Packages
}: }:
# TODO: put the X11 deps behind a guiSupport parameter for headless support # TODO: put the X11 deps behind a guiSupport parameter for headless support
@ -17,18 +17,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
pythonPackages.python python2Packages.python
pythonPackages.wrapPython python2Packages.wrapPython
]; ];
buildInputs = [ 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 libxslt libusb1
]; ];
pythonPath = [ pythonPath = [
pythonPackages.pygobject2 python2Packages.pygobject2
pythonPackages.pygtk python2Packages.pygtk
]; ];
patches = [ patches = [
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct
scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
systemd=yes udevdir="$out/lib/udev" \ 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 = '' checkPhase = ''