diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5a356e8cfde9..87e6e966223c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5083,6 +5083,12 @@
     githubId = 265220;
     name = "David Leung";
   };
+  diadatp = {
+    email = "nixpkgs@diadatp.com";
+    github = "diadatp";
+    githubId = 4490283;
+    name = "diadatp";
+  };
   DianaOlympos = {
     github = "DianaOlympos";
     githubId = 15774340;
diff --git a/pkgs/by-name/ns/nstool/package.nix b/pkgs/by-name/ns/nstool/package.nix
new file mode 100644
index 000000000000..d8da97e3c2de
--- /dev/null
+++ b/pkgs/by-name/ns/nstool/package.nix
@@ -0,0 +1,36 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nstool";
+  version = "1.9.0";
+
+  src = fetchFromGitHub {
+    owner = "jakcron";
+    repo = "nstool";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-NGuosc4Vwc4WA+b7mtn2WyJFPI4xfx/vJsd8S58js+U=";
+    fetchSubmodules = true;
+  };
+
+  preBuild = ''
+    make deps
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v bin/nstool $out/bin
+  '';
+
+  meta = {
+    description = "General purpose reading/extraction tool for Nintendo Switch file formats";
+    homepage = "https://github.com/jakcron/nstool";
+    license = lib.licenses.mit;
+    mainProgram = "nstool";
+    maintainers = with lib.maintainers; [ diadatp ];
+    platforms = lib.platforms.unix;
+  };
+})