Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40567497a94c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 693a4efa4c49
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on May 31, 2019

  1. betaflight-configurator: init at 10.5.1

    @wucke13
    wucke13 committed May 31, 2019
    Copy the full SHA
    170009b View commit details

  2. Update pkgs/applications/science/robotics/betaflight-configurator/def… 

    …ault.nix

Co-Authored-By: Paul TREHIOU <paul@nyanlout.re>
    @wucke13 @nyanloutre
    wucke13 and nyanloutre committed May 31, 2019
    Copy the full SHA
    5fcf9f5 View commit details

  3. Update pkgs/applications/science/robotics/betaflight-configurator/def… 

    …ault.nix

Co-Authored-By: Paul TREHIOU <paul@nyanlout.re>
    @wucke13 @nyanloutre
    wucke13 and nyanloutre committed May 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db3a1d8 View commit details

  4. Added makeWrapper suggestion

    @wucke13
    wucke13 committed May 31, 2019
    Copy the full SHA
    fd121cd View commit details

Commits on Jun 5, 2019

  1. Merge pull request #53013 from wucke13/betaflight-configurator-naive 

    betaflight-configurator: init at 10.5.1
    @matthewbauer
    matthewbauer authored Jun 5, 2019
    Copy the full SHA
    693a4ef View commit details
Showing with 52 additions and 0 deletions.
  1. +50 −0 pkgs/applications/science/robotics/betaflight-configurator/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
50 changes: 50 additions & 0 deletions pkgs/applications/science/robotics/betaflight-configurator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, makeWrapper, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:

let
strippedName = "betaflight-configurator";
desktopItem = makeDesktopItem {
name = strippedName;
exec = strippedName;
icon = "${strippedName}-icon.png";
comment = "Betaflight configuration tool";
desktopName = "Betaflight Configurator";
genericName = "Flight controller configuration tool";
};
in
stdenv.mkDerivation rec {
name = "${strippedName}-${version}";
version = "10.5.1";
src = fetchurl {
url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip";
sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
};

nativeBuildInputs = [ wrapGAppsHook ];

buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];

installPhase = ''
mkdir -p $out/bin \
$out/opt/${strippedName} \
$out/share/icons
cp -r . $out/opt/${strippedName}/
cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
cp -r ${desktopItem}/share/applications $out/share/
makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
'';

meta = with stdenv.lib; {
description = "The Betaflight flight control system configuration tool";
longDescription = ''
A crossplatform configuration tool for the Betaflight flight control system.
Various types of aircraft are supported by the tool and by Betaflight, e.g.
quadcopters, hexacopters, octocopters and fixed-wing aircraft.
'';
homepage = https://github.com/betaflight/betaflight/wiki;
license = licenses.gpl3;
maintainers = with maintainers; [ wucke13 ];
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23000,6 +23000,8 @@ in

apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { };

betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };

### MISC

acpilight = callPackage ../misc/acpilight { };