diff options
| author | Ollie Charles <ollie@ocharles.org.uk> | 2017-01-21 12:26:30 +0000 |
|---|---|---|
| committer | Ollie Charles <ollie@ocharles.org.uk> | 2017-01-21 12:26:30 +0000 |
| commit | 72a002f9d617caa26617570cf00afe0ce748cb4b (patch) | |
| tree | 94def27e0de32b2a952c2b0c54ac7a727182023d /pkgs/applications/misc/golden-cheetah | |
| parent | 4884fa45028e0105b0503fb933f522fddf4df90d (diff) | |
| download | nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar.gz nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar.bz2 nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar.lz nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar.xz nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.tar.zst nixpkgs-72a002f9d617caa26617570cf00afe0ce748cb4b.zip | |
golden-cheetah: Switch to 3.4 stable
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 5a149657931..68c9246c24b 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -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"; |