mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
Merge pull request #66320 from lightbulbjim/golden-cheetah-wrapping
golden-cheetah: use qt5's mkDerivation
This commit is contained in:
commit
8d2008ccc6
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user