swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues 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 04:44:31 +02:00
parent 01900ac06e
commit 11294eaf16
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file

@ -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/";