mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
golden-cheetah: Switch to 3.4 stable
This commit is contained in:
parent
4884fa4502
commit
72a002f9d6
@ -1,34 +1,30 @@
|
||||
{ stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia
|
||||
, qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }:
|
||||
{ stdenv, fetchurl
|
||||
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
|
||||
, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "golden-cheetah-${version}";
|
||||
version = "4.0-DEV1603";
|
||||
version = "3.4";
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
|
||||
sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah";
|
||||
sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
|
||||
};
|
||||
buildInputs = [
|
||||
qtInputs = [
|
||||
qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
|
||||
qtconnectivity
|
||||
];
|
||||
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
|
||||
nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
|
||||
preConfigure = ''
|
||||
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
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
'';
|
||||
#postConfigure =
|
||||
# + (
|
||||
# with (config.golden-cheetah);
|
||||
# stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
|
||||
# echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri
|
||||
# echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri
|
||||
# '');
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp src/GoldenCheetah $out/bin
|
||||
wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" # patchelf doesn't seem to work
|
||||
wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
|
||||
'';
|
||||
meta = {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
|
@ -18001,7 +18001,7 @@ in
|
||||
|
||||
discord = callPackage ../applications/networking/instant-messengers/discord { };
|
||||
|
||||
golden-cheetah = qt55.callPackage ../applications/misc/golden-cheetah {};
|
||||
golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
|
||||
|
||||
linkchecker = callPackage ../tools/networking/linkchecker { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user