diff options
| author | Ollie Charles <ollie@ocharles.org.uk> | 2016-04-19 11:13:33 +0100 |
|---|---|---|
| committer | Ollie Charles <ollie@ocharles.org.uk> | 2016-04-21 12:14:12 +0100 |
| commit | a74aa5bce790b4c334eee51213aba99bb9c03251 (patch) | |
| tree | 9d486606cf5bef14a300ff7c7c53767428a59811 /pkgs | |
| parent | c4ab7e2cd4f5ad39a2f1d590af2d2b72037fdfb2 (diff) | |
| download | nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar.gz nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar.bz2 nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar.lz nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar.xz nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.tar.zst nixlib-a74aa5bce790b4c334eee51213aba99bb9c03251.zip | |
golden-cheetah: Fix evaluation
For now, disable the Dropbox configuration.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 82695bbdd7ee..799746ee6bd5 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449a17137aeb..ca64821e383b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; } |