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

qgroundcontrol: move to qmakeHook

Browse Source 
This reverts commit 11294eaf168b524da9601c8b35d71b72ba3ad040.
This commit is contained in:
Nikolay Amiantov 2016-04-16 22:59:18 +03:00
parent 0b88755d37
commit fb2c651647
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake, overrideCC#, gcc48 { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake, overrideCC#, gcc48
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
, makeQtWrapper, lndir , makeQtWrapper, lndir
, gst_all_1, qt_gstreamer1, pkgconfig, glibc , gst_all_1, qt_gstreamer1, pkgconfig, glibc
, version ? "2.9.4" , version ? "2.9.4"
@ -23,21 +23,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig makeQtWrapper pkgconfig makeQtWrapper qmakeHook
] ++ qtInputs; ] ++ qtInputs;
patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
configurePhase = ''
runHook preConfigure
mkdir build
(cd build && qmake ../qgroundcontrol.pro)
runHook postConfigure
'';
preBuild = "pushd build/";
postBuild = "popd";
installPhase = '' installPhase = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp -v qgroundcontrol.desktop $out/share/applications cp -v qgroundcontrol.desktop $out/share/applications