From c816bbc8a86c7ea6c09ca42e1694fe08003a55fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 17 May 2017 14:26:11 -0500 Subject: qt5: remove makeQtWrapper --- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science/robotics/qgroundcontrol/default.nix') diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a4a08deb8e2d0..98ec39eb20642 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" ''; -- cgit 1.4.1