From 170009b12326a66fe02963e223e5648603bc2488 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Wed, 7 Nov 2018 14:24:19 +0100
Subject: [PATCH 1/4] betaflight-configurator: init at 10.5.1

---
 .../betaflight-configurator/default.nix       | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/science/robotics/betaflight-configurator/default.nix

diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
new file mode 100644
index 00000000000..10181a7b1fd
--- /dev/null
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -0,0 +1,53 @@
+{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs }:
+
+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";
+  };
+
+  buildInputs = [ unzip ];
+  
+  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/
+
+    cat >$out/bin/${strippedName}<<EOL
+    #!${runtimeShell}
+
+    ${nwjs}/bin/nw $out/opt/${strippedName} 
+    EOL
+    chmod +x $out/bin/${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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9954f6ff441..295aae465d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22983,6 +22983,8 @@ in
 
   apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { };
 
+  betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
+
   ### MISC
 
   acpilight = callPackage ../misc/acpilight { };

From 5fcf9f55594c5fd413fb798d9c1d05a528c85c35 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Fri, 31 May 2019 12:11:54 +0200
Subject: [PATCH 2/4] Update
 pkgs/applications/science/robotics/betaflight-configurator/default.nix

Co-Authored-By: Paul TREHIOU <paul@nyanlout.re>
---
 .../science/robotics/betaflight-configurator/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 10181a7b1fd..bc907bedb9c 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs }:
+{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
 
 let
   strippedName = "betaflight-configurator";

From db3a1d8adbd1476b3a04c6c8abe3e1275f8d6541 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Fri, 31 May 2019 12:12:06 +0200
Subject: [PATCH 3/4] Update
 pkgs/applications/science/robotics/betaflight-configurator/default.nix

Co-Authored-By: Paul TREHIOU <paul@nyanlout.re>
---
 .../science/robotics/betaflight-configurator/default.nix      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index bc907bedb9c..6220206b1a3 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ wrapGAppsHook ];
+  
+  buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
   
   installPhase = ''
     mkdir -p $out/bin \

From fd121cdd8806d7ed25c1b689ad63eea0ff71e139 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Fri, 31 May 2019 12:16:58 +0200
Subject: [PATCH 4/4] Added makeWrapper suggestion

---
 .../science/robotics/betaflight-configurator/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 6220206b1a3..2cedb7aeca4 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
+{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, makeWrapper, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
 
 let
   strippedName = "betaflight-configurator";
@@ -32,12 +32,7 @@ stdenv.mkDerivation rec {
     cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
     cp -r ${desktopItem}/share/applications $out/share/
 
-    cat >$out/bin/${strippedName}<<EOL
-    #!${runtimeShell}
-
-    ${nwjs}/bin/nw $out/opt/${strippedName} 
-    EOL
-    chmod +x $out/bin/${strippedName}
+    makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
   '';
 
   meta = with stdenv.lib; {