public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

golden-cheetah: Fix evaluation

Browse Source 
For now, disable the Dropbox configuration.
This commit is contained in:
Ollie Charles 2016-04-19 11:13:33 +01:00
parent c4ab7e2cd4
commit a74aa5bce7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -18,12 +18,13 @@ stdenv.mkDerivation rec {
echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
qmake PREFIX=$out build.pro qmake PREFIX=$out build.pro
'' + ( '';
with (config.golden-cheetah); # + (
stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' # with (config.golden-cheetah);
echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri # echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri
''); # echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri
# '');
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp src/GoldenCheetah $out/bin cp src/GoldenCheetah $out/bin

2
pkgs/top-level/all-packages.nix
View File

@ -16607,5 +16607,5 @@ in
discord = callPackage ../applications/networking/instant-messengers/discord { }; discord = callPackage ../applications/networking/instant-messengers/discord { };
#golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
} }