diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-21 03:12:49 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-21 03:13:04 +0300 |
| commit | b845596f666a8458fb7476e2f861b14cda89be1e (patch) | |
| tree | 0e51b3eceb76712183367cf33e1f12077ea52eaa /pkgs/applications/misc/golden-cheetah | |
| parent | 1c8ac5299914c5b2f2387b2012658dce03894c69 (diff) | |
| download | nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar.gz nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar.bz2 nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar.lz nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar.xz nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.tar.zst nixpkgs-b845596f666a8458fb7476e2f861b14cda89be1e.zip | |
golden-cheetah: use qmakeHook
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 82695bbdd7e..5c471919f24 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia -, qttools, yacc, flex, zlib, config, makeQtWrapper }: +, qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; version = "V4.0-DEV1603"; @@ -10,20 +10,19 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib ]; - nativeBuildInputs = [ makeQtWrapper ]; - configurePhase = '' - runHook preConfigure + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri 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 - '' + ( + ''; + postConfigure = 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 |