diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/pkgs/by-name/to/toluapp/environ-and-linux-is-kinda-posix.patch
similarity index 100%
rename from pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch
rename to pkgs/by-name/to/toluapp/environ-and-linux-is-kinda-posix.patch
diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/by-name/to/toluapp/headers.patch
similarity index 100%
rename from pkgs/development/tools/toluapp/headers.patch
rename to pkgs/by-name/to/toluapp/headers.patch
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/by-name/to/toluapp/package.nix
similarity index 86%
rename from pkgs/development/tools/toluapp/default.nix
rename to pkgs/by-name/to/toluapp/package.nix
index f1ce649c27b4..51fe973610c7 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/by-name/to/toluapp/package.nix
@@ -3,22 +3,24 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  lua,
+  lua5_1,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.0.93";
   pname = "toluapp";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "LuaDist";
     repo = "toluapp";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ lua ];
+  buildInputs = [ lua5_1 ];
 
   patches = [
     ./environ-and-linux-is-kinda-posix.patch
@@ -41,4 +43,4 @@ stdenv.mkDerivation rec {
     mainProgram = "tolua++";
     platforms = with lib.platforms; unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6030ccf0a383..26a6d6d1badb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4761,10 +4761,6 @@ with pkgs;
   luarocks = luaPackages.luarocks;
   luarocks-nix = luaPackages.luarocks-nix;
 
-  toluapp = callPackage ../development/tools/toluapp {
-    lua = lua5_1; # doesn't work with any other :(
-  };
-
   ### END OF LUA
 
   ### CuboCore