diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 294df339e0d29..12e7597c345aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9459,6 +9459,12 @@
     githubId = 3661115;
     name = "Ingo Blechschmidt";
   };
+  icedborn = {
+    email = "github.envenomed@dralias.com";
+    github = "icedborn";
+    githubId = 51162078;
+    name = "IceDBorn";
+  };
   icewind1991 = {
     name = "Robin Appelman";
     email = "robin@icewind.nl";
diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix
new file mode 100644
index 0000000000000..86f94d287f5f5
--- /dev/null
+++ b/pkgs/by-name/fa/falkor/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  electron,
+  dpkg,
+  makeWrapper,
+  commandLineArgs ? "",
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "falkor";
+  version = "0.0.92";
+
+  src = fetchurl {
+    url = "https://github.com/Team-Falkor/falkor/releases/download/v${finalAttrs.version}/falkor.deb";
+    hash = "sha256-yDpYu2ehrRQuD29jcyTQla2R2IT1zfBDeWDDRnmqc8Y=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    dpkg
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mv usr/share $out/share
+    mkdir -p $out/share/falkor
+    sed -i "s|Exec=.*|Exec=falkor|" $out/share/applications/*.desktop
+    mv opt/falkor/{resources,resources.pak,locales} $out/share/falkor
+
+    makeWrapper ${lib.getExe electron} $out/bin/falkor \
+      --argv0 "falkor" \
+      --add-flags "$out/share/falkor/resources/app.asar" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Electron-based gaming hub";
+    homepage = "https://github.com/Team-Falkor/falkor";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ icedborn ];
+    platforms = [ "x86_64-linux" ];
+    hydraPlatforms = [ ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    mainProgram = "falkor";
+  };
+})