diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
commit | dc33419285c09720de70fe8edf5434736a2462b9 (patch) | |
tree | 58b20bca2075a06ad5b720c6ebf0dc55635e6b10 /pkgs/applications/science | |
parent | b59847b848079ba872e18b5f0683c1bff7e924ba (diff) | |
parent | b56c66e7e8565b16a4964840ef40243e07f78e84 (diff) | |
download | nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.gz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.bz2 nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.lz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.xz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.zst nixlib-dc33419285c09720de70fe8edf5434736a2462b9.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/biology/picard-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4b455eaca6fd..a1616774d5d7 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.8"; + version = "2.22.9"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0g387jlf7r1p2kx8gya3vxksbjy3y2ywxa7yjqmxg3y8725fyixl"; + sha256 = "0qm32a58b2asiw8rnw1r6vz3bi61vfdan6wyr9f78fj4d07q7n53"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1f9d43b33521..63247bcff728 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,34 +1,31 @@ { lib, mkDerivation, fetchgit, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 -, qtgraphicaleffects, qtspeech, qmake -, makeWrapper -, gst_all_1, pkgconfig +, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools +, gst_all_1, wayland, pkgconfig }: mkDerivation rec { pname = "qgroundcontrol"; - version = "3.5.5"; + version = "4.0.8"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech + qtgraphicaleffects qtspeech qtx11extras ]; gstInputs = with gst_all_1; [ - gstreamer gst-plugins-base + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland ]; enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake qttools ]; preConfigure = '' mkdir build cd build ''; - NIX_CFLAGS_COMPILE = [ "-Wno-address-of-packed-member" ]; # Don't litter logs with these warnings - qmakeFlags = [ # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" @@ -36,6 +33,8 @@ mkDerivation rec { ]; installPhase = '' + runHook preInstall + cd .. mkdir -p $out/share/applications @@ -50,18 +49,19 @@ mkDerivation rec { mkdir -p $out/share/pixmaps cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps + + runHook postInstall ''; postInstall = '' - wrapProgram "$out/bin/qgroundcontrol" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; # TODO: package mavlink so we can build from a normal source tarball src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; rev = "v${version}"; - sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs"; + sha256 = "0jr9jpjqdwizsvh9zm0fdp8k2r4536m40dxrn30fbr3ba8vnzkgq"; fetchSubmodules = true; }; @@ -70,6 +70,6 @@ mkDerivation rec { homepage = "http://qgroundcontrol.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lopsided98 ]; }; } |