diff options
| author | Chris Rendle-Short <chris@killred.net> | 2019-08-08 21:01:09 +1000 |
|---|---|---|
| committer | Chris Rendle-Short <chris@killred.net> | 2019-08-08 22:34:05 +1000 |
| commit | 9081eefb9aaf391a3571e32d9ea8ec36fd5163da (patch) | |
| tree | 9f222f330bd1b9a11454e7e72b840ef285ddf626 /pkgs/applications/misc/golden-cheetah | |
| parent | 9175a201bbb28e679d72e9f7d28c84ab7d1f742b (diff) | |
| download | nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar.gz nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar.bz2 nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar.lz nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar.xz nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.tar.zst nixpkgs-9081eefb9aaf391a3571e32d9ea8ec36fd5163da.zip | |
golden-cheetah: use qt5's mkDerivation
See #65399
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index edf16f806a6..d4ff7269987 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, mkDerivation, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -13,7 +13,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.4"; src = fetchurl { @@ -29,6 +29,9 @@ 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 @@ -40,7 +43,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 |