Merge pull request #76172 from JohnAZoidberg/golden-cheetah-libusb
golden-cheetah: Add libusb (ANT+ sensors), 3.5-DEV1903 -> 3.5-RC2X
This commit is contained in:
commit
25ce30d6a2
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts
|
||||
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts, libusb
|
||||
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
}:
|
||||
|
||||
|
@ -16,18 +16,18 @@ let
|
|||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
version = "3.5-DEV1903";
|
||||
version = "3.5-RC2X";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldenCheetah";
|
||||
repo = "GoldenCheetah";
|
||||
rev = "v${version}";
|
||||
sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3";
|
||||
rev = "V${version}";
|
||||
sha256 = "1d85700gjbcw2badwz225rjdr954ai89900vp8sal04sk79wbr6g";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
|
||||
qtconnectivity qtcharts
|
||||
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
|
||||
qtconnectivity qtcharts libusb
|
||||
];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
|
||||
|
||||
|
@ -39,7 +39,14 @@ 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
|
||||
|
||||
# Use qtwebengine instead of qtwebkit
|
||||
substituteInPlace src/gcconfig.pri \
|
||||
--replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
@ -53,9 +60,6 @@ in mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
platforms = platforms.linux;
|
||||
|
|
Loading…
Reference in New Issue