cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #121373 from dguibert/dg/golden-cheetah

Browse source 
golden-cheetah: 3.5 -> 3.6-DEV2107
This commit is contained in:
Florian Klink 2021-07-13 01:06:35 +02:00 committed by GitHub
commit 069a093fab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/misc/golden-cheetah/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch, mkDerivation { lib, fetchFromGitHub, fetchpatch, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb-compat-0_1 , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas
, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper , bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
}: }:
@ -16,18 +16,18 @@ let
}; };
in mkDerivation rec { in mkDerivation rec {
pname = "golden-cheetah"; pname = "golden-cheetah";
version = "3.5"; version = "3.6-DEV2107";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoldenCheetah"; owner = "GoldenCheetah";
repo = "GoldenCheetah"; repo = "GoldenCheetah";
rev = "V${version}"; rev = "v${version}";
sha256 = "1lyd0b2s3s9c2ppj7l4hf3s4gfzscaaam2pbiaby714bi9nr0ka7"; sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d";
}; };
buildInputs = [ buildInputs = [
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
qtconnectivity qtcharts libusb-compat-0_1 qtconnectivity qtcharts libusb-compat-0_1 gsl blas
]; ];
nativeBuildInputs = [ flex makeWrapper qmake bison ]; nativeBuildInputs = [ flex makeWrapper qmake bison ];
@ -40,9 +40,9 @@ in mkDerivation rec {
}) })
]; ];
NIX_LDFLAGS = "-lz"; NIX_LDFLAGS = "-lz -lgsl -lblas";
qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "${zlib.out}/lib" ];
preConfigure = '' preConfigure = ''
cp src/gcconfig.pri.in src/gcconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri
@ -52,10 +52,6 @@ in mkDerivation rec {
echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local 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 = '' installPhase = ''
@ -73,6 +69,6 @@ in mkDerivation rec {
description = "Performance software for cyclists, runners and triathletes"; description = "Performance software for cyclists, runners and triathletes";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ ]; maintainers = [ ];
license = licenses.gpl3; license = licenses.gpl2Plus;
}; };
} }