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

qgroundcontrol: Fix running of {pre,post}Configure

Browse Source 
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>
This commit is contained in:
aszlig
2016-04-15 05:26:02 +02:00
parent 01900ac06e
commit 11294eaf16
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/robotics/qgroundcontrol/default.nix
+3 -5
View File
@@ -29,12 +29,10 @@ stdenv.mkDerivation rec {
patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
configurePhase = '' configurePhase = ''
runHook preConfigure
mkdir build mkdir build
pushd build (cd build && qmake ../qgroundcontrol.pro)
runHook postConfigure
qmake ../qgroundcontrol.pro
popd
''; '';
preBuild = "pushd build/"; preBuild = "pushd build/";