mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
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:
parent
1bb8a47803
commit
c7dd8a707b
@ -22,9 +22,13 @@ stdenv.mkDerivation rec {
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp src/GoldenCheetah $out/bin
|
||||
wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
meta = {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
|
@ -18434,7 +18434,7 @@ with pkgs;
|
||||
|
||||
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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user