diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-02 10:40:19 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:41:57 -0500 |
| commit | 210f6888023c1df8aff2d053a5e41f5e1effdfe7 (patch) | |
| tree | 376b0af02afa925c84a968cfcc74d296b6a09f6e /pkgs/applications/science | |
| parent | 3f3d33a07867116446ec9b5e2675ef1c8de8127d (diff) | |
| download | nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.gz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.bz2 nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.lz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.xz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.zst nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.zip | |
qt5: rename qmakeHook to qmake
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/fritzing/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 20 |
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 838697f1394f..b978e644a8ec 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmakeHook, pkgconfig +{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig , qtbase, qtsvg, qtserialport, boost, libgit2 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ]; + nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ]; qmakeFlags = [ "phoenix.pro" ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 580d9f0e76e9..a4a08deb8e2d 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,19 +1,16 @@ { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake - , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns - , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook - , makeQtWrapper, lndir - , gst_all_1, qt-gstreamer1, pkgconfig, glibc - , version ? "2.9.4" +, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns +, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake +, makeQtWrapper, lndir +, gst_all_1, qt-gstreamer1, pkgconfig, glibc +, version ? "2.9.4" }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; - buildInputs = [ - SDL udev doxygen git - ] ++ gstInputs; qtInputs = [ - qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg + qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg qtquick1 qtquickcontrols qtgraphicaleffects ]; @@ -22,9 +19,8 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ - pkgconfig makeQtWrapper qmakeHook - ] ++ qtInputs; + buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs; + nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ]; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; postPatch = '' |