public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

golden-cheetah: fix build 

- Use Qt 5.6 to fix compile error.
- Run preInstall and postInstall hooks to fix linking error.
This commit is contained in:
Thomas Tuegel 2017-04-10 13:51:45 -05:00
parent 1bb8a47803
commit c7dd8a707b
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -22,9 +22,13 @@ stdenv.mkDerivation rec {
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
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
cp src/GoldenCheetah $out/bin cp src/GoldenCheetah $out/bin
wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
runHook postInstall
''; '';
meta = { meta = {
description = "Performance software for cyclists, runners and triathletes"; description = "Performance software for cyclists, runners and triathletes";

2
pkgs/top-level/all-packages.nix
View File

@ -18434,7 +18434,7 @@ with pkgs;
discord = callPackage ../applications/networking/instant-messengers/discord { }; discord = callPackage ../applications/networking/instant-messengers/discord { };
golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {};
linkchecker = callPackage ../tools/networking/linkchecker { }; linkchecker = callPackage ../tools/networking/linkchecker { };