alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #112196 from lopsided98/qgroundcontrol-update

Browse source 
qgroundcontrol: 4.0.11 -> 4.1.1
This commit is contained in:
Sandro 2021-02-07 01:14:58 +01:00 committed by GitHub
parent 1f218c632d 9a635d38b6
commit 6f67b153d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file

@ -6,7 +6,7 @@
mkDerivation rec { mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "4.0.11"; version = "4.1.1";
qtInputs = [ qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -27,6 +27,7 @@ mkDerivation rec {
''; '';
qmakeFlags = [ qmakeFlags = [
"CONFIG+=StableBuild"
# Default install tries to copy Qt files into package # Default install tries to copy Qt files into package
"CONFIG+=QGC_DISABLE_BUILD_SETUP" "CONFIG+=QGC_DISABLE_BUILD_SETUP"
"../qgroundcontrol.pro" "../qgroundcontrol.pro"
@ -42,7 +43,7 @@ mkDerivation rec {
cp -v deploy/qgroundcontrol.desktop $out/share/applications cp -v deploy/qgroundcontrol.desktop $out/share/applications
mkdir -p $out/bin mkdir -p $out/bin
cp -v build/release/QGroundControl "$out/bin/" cp -v build/staging/QGroundControl "$out/bin/"
mkdir -p $out/share/qgroundcontrol mkdir -p $out/share/qgroundcontrol
cp -rv resources/ $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol
@ -62,7 +63,7 @@ mkDerivation rec {
owner = "mavlink"; owner = "mavlink";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm";
fetchSubmodules = true; fetchSubmodules = true;
}; };