git.iko.soy/typeable/nixpkgs
on master help sign in
golden-cheetah: use qt5's mkDerivation

See #65399

commit9081eefb9aaf391a3571e32d9ea8ec36fd5163da authorChris Rendle-Short <chris@killred.net> dateThu 8 Aug 2019, 21:01 (7 years ago) parent9175a20
1 file changed+5−3
pkgs/applications/misc/golden-cheetah/default.nix+5−3
pkgs/applications/misc/golden-cheetah/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ stdenv, mkDerivation, fetchurl
22, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
33, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
44}:
@@ -13,7 +13,7 @@ let
1313 comment = "Performance software for cyclists, runners and triathletes";
1414 categories = "Application;Utility;";
1515 };
16−in stdenv.mkDerivation rec {
16+in mkDerivation rec {
1717 name = "golden-cheetah-${version}";
1818 version = "3.4";
1919 src = fetchurl {
@@ -29,6 +29,9 @@ in stdenv.mkDerivation rec {
2929 NIX_LDFLAGS = [
3030 "-lz"
3131 ];
32+
33+ qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];
34+
3235 preConfigure = ''
3336 cp src/gcconfig.pri.in src/gcconfig.pri
3437 cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
@@ -40,7 +43,6 @@ in stdenv.mkDerivation rec {
4043
4144 mkdir -p $out/bin
4245 cp src/GoldenCheetah $out/bin
43− wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
4446 install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
4547 install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
4648