diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:18 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:48 +0300 |
| commit | fb2c651647a6de71d4ab036215b1cf1758addcc2 (patch) | |
| tree | a8160235d6eabcde743704346bed5d20078b8454 /pkgs/applications/science/robotics | |
| parent | 0b88755d3751271dc544833d61888b5809f0bba2 (diff) | |
| download | nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar.gz nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar.bz2 nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar.lz nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar.xz nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.tar.zst nixlib-fb2c651647a6de71d4ab036215b1cf1758addcc2.zip | |
qgroundcontrol: move to qmakeHook
This reverts commit 11294eaf168b524da9601c8b35d71b72ba3ad040.
Diffstat (limited to 'pkgs/applications/science/robotics')
| -rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 692be0a88b12..cac9fef182cf 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake, overrideCC#, gcc48 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns - , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects + , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook , makeQtWrapper, lndir , gst_all_1, qt_gstreamer1, pkgconfig, glibc , version ? "2.9.4" @@ -23,21 +23,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig makeQtWrapper + pkgconfig makeQtWrapper qmakeHook ] ++ qtInputs; 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 = '' mkdir -p $out/share/applications cp -v qgroundcontrol.desktop $out/share/applications |