diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
| commit | f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d (patch) | |
| tree | 43c003d74f5de4cf4f42207cfd933d1077f8f04a /pkgs/applications/misc/golden-cheetah | |
| parent | 9135412b63fcdb8d5cf1be659b657628f754d9c5 (diff) | |
| parent | 609d408970362522c3b85ea5f903321247ed502f (diff) | |
| download | nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar.gz nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar.bz2 nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar.lz nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar.xz nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.tar.zst nixpkgs-f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d.zip | |
Merge remote-tracking branch 'upstream/master' into openssl-1.1
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 2e63be454ef..0fb8f3ef343 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -14,7 +14,7 @@ let comment = "Performance software for cyclists, runners and triathletes"; categories = "Application;Utility;"; }; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "golden-cheetah-${version}"; version = "3.5-DEV1903"; @@ -33,6 +33,8 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lz" ]; + qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; + preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri @@ -45,7 +47,6 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp src/GoldenCheetah $out/bin - wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png |