luaPackages.lua-iconv: move to generated

4 files changed, 24 insertions, 26 deletions

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index a70595ef3eb3..0f3db834fc29 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -13,6 +13,7 @@ lrexlib-posix,
 ltermbox,
 lua-cmsgpack,
 lua_cliargs,
+lua-iconv,
 lua-term,
 luabitop,
 luaevent,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4025f83ce2e1..7da4a9eeddf3 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -320,6 +320,26 @@ lua_cliargs = buildLuarocksPackage {
     };
   };
 };
+lua-iconv = buildLuarocksPackage {
+  pname = "lua-iconv";
+  version = "7-3";
+
+  src =  fetchurl {
+      url    = https://luarocks.org/lua-iconv-7-3.src.rock;
+      sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83";
+   };
+  disabled = ( luaOlder "5.1");
+  propagatedBuildInputs = [lua  ];
+  buildType="builtin";
+
+  meta = {
+    homepage = "http://ittner.github.com/lua-iconv/";
+    description="Lua binding to the iconv";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 lua-term = buildLuarocksPackage {
   pname = "lua-term";
   version = "0.7-1";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 4d2178906c72..b78f7f9c0079 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -56,6 +56,9 @@ with super;
     '';
     disabled= luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
   });
+  lua-iconv = super.lua-iconv.override({
+    buildInputs = [ pkgs.libiconv ];
+  });
   luv = super.luv.overrideAttrs(oa: {
     propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ];
   });
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index a25ea3283df0..ed0b919fd690 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -384,32 +384,6 @@ with self; {
     };
   };
 
-  lua-iconv = buildLuaPackage rec {
-    name = "lua-iconv-${version}";
-    version = "7";
-
-    src = fetchFromGitHub {
-      owner = "ittner";
-      repo = "lua-iconv";
-      rev = name;
-      sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i";
-    };
-
-    preBuild = ''
-      makeFlagsArray=(
-        INSTALL_PATH="$out/lib/lua/${lua.luaversion}"
-      );
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Lua bindings for POSIX iconv";
-      homepage = "https://ittner.github.io/lua-iconv/";
-      license = licenses.mit;
-      maintainers = with maintainers; [ richardipsum ];
-      platforms = platforms.unix;
-    };
-  };
-
   luasec = buildLuaPackage rec {
     name = "sec-0.6";