From cf1088a147833501c2e274b39fdbaa8dd6d4de88 Mon Sep 17 00:00:00 2001
From: beezow <zbeezow@gmail.com>
Date: Sun, 20 Jun 2021 20:40:37 -0600
Subject: [PATCH 1/3] maintainers: add beezow

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8e18d02698e9..96ba6e303287 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1202,6 +1202,12 @@
     github = "beardhatcode";
     githubId = 662538;
   };
+  beezow = {
+    name = "beezow";
+    email = "zbeezow@gmail.com";
+    github = "beezow";
+    githubId = 42082156;
+  };
   bendlas = {
     email = "herwig@bendlas.net";
     github = "bendlas";

From 4eb4579833889fc6bf29f6003c0cec6ee2784b0d Mon Sep 17 00:00:00 2001
From: beezow <zbeezow@gmail.com>
Date: Sun, 20 Jun 2021 20:46:38 -0600
Subject: [PATCH 2/3] emuflight-configurator: init at 0.3.5

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

diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix
new file mode 100644
index 000000000000..2bad9fc0d321
--- /dev/null
+++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix
@@ -0,0 +1,53 @@
+{lib, stdenv, fetchurl, unzip, makeDesktopItem, copyDesktopItems, nwjs
+, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
+
+let
+in
+stdenv.mkDerivation rec {
+  pname = "emuflight-configurator";
+  version = "0.3.5";
+
+  src = fetchurl {
+    url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip";
+    sha256 = "d55bdc52cf93d58c728ccb296ef912a5fc0f42c57ed95f3ded5f85d1c10838c4";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ];
+
+  buildInputs = [ gsettings-desktop-schemas gtk3 ];
+
+  installPhase = ''
+    mkdir -p $out/bin \
+             $out/share/${pname}
+
+    cp -r . $out/share/${pname}/
+    install -m 444 -D icon/emu_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png
+
+    makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/share/${pname}
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = pname;
+      icon = pname;
+      comment = "Emuflight configuration tool";
+      desktopName = "Emuflight Configurator";
+      genericName = "Flight controller configuration tool";
+    })
+  ];
+
+  meta = with lib; {
+    description = "The Emuflight flight control system configuration tool";
+    longDescription = ''
+      A crossplatform configuration tool for the Emuflight flight control system.
+      Various types of aircraft are supported by the tool and by Emuflight, e.g.
+      quadcopters, hexacopters, octocopters and fixed-wing aircraft.
+      The application allows you to configure the Emuflight software running on any supported Emuflight target.
+    '';
+    homepage    = "https://github.com/emuflight/EmuConfigurator";
+    license     = licenses.gpl3Only;
+    maintainers = with maintainers; [ beezow ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40be91d9a71a..43a22704e0fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30355,6 +30355,8 @@ in
 
   betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
 
+  emuflight-configurator = callPackage ../applications/science/robotics/emuflight-configurator { };
+
   mission-planner = callPackage ../applications/science/robotics/mission-planner { };
 
   ### MISC

From fac2f63654ec7827e2e03a9c6b839683fa57ef95 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 23 Jun 2021 11:13:00 +0200
Subject: [PATCH 3/3] Apply suggestions from code review

---
 .../science/robotics/emuflight-configurator/default.nix      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix
index 2bad9fc0d321..2b89a00eb4bd 100644
--- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix
@@ -1,8 +1,6 @@
 {lib, stdenv, fetchurl, unzip, makeDesktopItem, copyDesktopItems, nwjs
 , wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
 
-let
-in
 stdenv.mkDerivation rec {
   pname = "emuflight-configurator";
   version = "0.3.5";
@@ -17,8 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gsettings-desktop-schemas gtk3 ];
 
   installPhase = ''
-    mkdir -p $out/bin \
-             $out/share/${pname}
+    mkdir -p $out/bin $out/share/${pname}
 
     cp -r . $out/share/${pname}/
     install -m 444 -D icon/emu_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png