From 6c8283e337423909ca8335a696584304bfdfc5c7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 22 Dec 2019 15:47:18 +0100 Subject: [PATCH] golden-cheetah: Enable libusb support Makes it possible to use ANT+ sensors using an ANT+ USB transceiver. --- pkgs/applications/misc/golden-cheetah/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 7fba1d49d74..7abee2c5539 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools -, qtconnectivity, qtcharts +, qtconnectivity, qtcharts, libusb , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib - qtconnectivity qtcharts + qtconnectivity qtcharts libusb ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,6 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local '';