diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:44:31 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
commit | 11294eaf168b524da9601c8b35d71b72ba3ad040 (patch) | |
tree | 7f06331ed8af608ac212ece3d6d2ff5684e48001 /pkgs/applications/science/robotics | |
parent | 01900ac06eb2245df7d8ba1e9157ed79d7b94b0f (diff) | |
download | nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar.gz nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar.bz2 nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar.lz nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar.xz nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.tar.zst nixpkgs-11294eaf168b524da9601c8b35d71b72ba3ad040.zip |
qgroundcontrol: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of qgroundcontrol override the whole configurePhase, so this hook isn't run at all. Instead of using pushd/popd, I'm making it a bit more readable by just spawning a subshell with the right working directory. This fixes the build of qgroundcontrol and it now successfully compiles on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/science/robotics')
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 0d7e3ca55f1..692be0a88b1 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -29,12 +29,10 @@ stdenv.mkDerivation rec { patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; configurePhase = '' + runHook preConfigure mkdir build - pushd build - - qmake ../qgroundcontrol.pro - - popd + (cd build && qmake ../qgroundcontrol.pro) + runHook postConfigure ''; preBuild = "pushd build/"; |