Merge pull request #71073 from nyanloutre/betaflight_configurator_10_6_0

betaflight-configurator: 10.5.1 -> 10.6.0
This commit is contained in:
Renaud 2019-10-20 20:01:00 +02:00 committed by GitHub
commit 410d794f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,22 @@
{stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: {stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
let let
strippedName = "betaflight-configurator"; pname = "betaflight-configurator";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = strippedName; name = pname;
exec = strippedName; exec = pname;
icon = "${strippedName}-icon.png"; icon = pname;
comment = "Betaflight configuration tool"; comment = "Betaflight configuration tool";
desktopName = "Betaflight Configurator"; desktopName = "Betaflight Configurator";
genericName = "Flight controller configuration tool"; genericName = "Flight controller configuration tool";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${strippedName}-${version}"; inherit pname;
version = "10.5.1"; version = "10.6.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip"; url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc"; sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
@ -25,14 +25,13 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin \ mkdir -p $out/bin \
$out/opt/${strippedName} \ $out/opt/${pname}
$out/share/icons
cp -r . $out/opt/${strippedName}/ cp -r . $out/opt/${pname}/
cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png install -m 444 -D icon/bf_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png
cp -r ${desktopItem}/share/applications $out/share/ cp -r ${desktopItem}/share/applications $out/share/
makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName} makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {