mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
golden-cheetah: Fix evaluation
For now, disable the Dropbox configuration.
This commit is contained in:
parent
c4ab7e2cd4
commit
a74aa5bce7
@ -18,12 +18,13 @@ stdenv.mkDerivation rec {
|
||||
echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
qmake PREFIX=$out build.pro
|
||||
'' + (
|
||||
with (config.golden-cheetah);
|
||||
stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
|
||||
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
|
||||
'');
|
||||
'';
|
||||
# + (
|
||||
# with (config.golden-cheetah);
|
||||
# stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
|
||||
# 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 = ''
|
||||
mkdir -p $out/bin
|
||||
cp src/GoldenCheetah $out/bin
|
||||
|
@ -16607,5 +16607,5 @@ in
|
||||
|
||||
discord = callPackage ../applications/networking/instant-messengers/discord { };
|
||||
|
||||
#golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
|
||||
golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user