From c7dd8a707be6c5192593cd249d8018ac9f87b9cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 10 Apr 2017 13:51:45 -0500 Subject: [PATCH] golden-cheetah: fix build - Use Qt 5.6 to fix compile error. - Run preInstall and postInstall hooks to fix linking error. --- pkgs/applications/misc/golden-cheetah/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 68c9246c24b1..d6da900656cc 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45562df31700..38b92de3d557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };