diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/science/robotics | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/science/robotics')
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a4a08deb8e2d..98ec39eb2064 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake -, makeQtWrapper, lndir +, makeWrapper, lndir , gst_all_1, qt-gstreamer1, pkgconfig, glibc , version ? "2.9.4" }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ]; + nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; postPatch = '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postInstall = '' - wrapQtProgram "$out/bin/qgroundcontrol" \ + wrapProgram "$out/bin/qgroundcontrol" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; |