diff options
Diffstat (limited to 'pkgs/development/interpreters/lua-5/build-luarocks-package.nix')
-rw-r--r-- | pkgs/development/interpreters/lua-5/build-luarocks-package.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index b4eec6d8ff2dd..6f3342d057bd1 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -2,7 +2,7 @@ { lib , lua , wrapLua -, luarocks +, luarocks_bootstrap , writeTextFile # Whether the derivation provides a lua module or not. @@ -78,7 +78,7 @@ let luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: attrs // { - name = namePrefix + pname + "-" + self.version; + name = namePrefix + self.pname + "-" + self.version; inherit rockspecVersion; __structuredAttrs = true; @@ -91,7 +91,7 @@ let nativeBuildInputs = [ lua # for lua.h wrapLua - luarocks + luarocks_bootstrap ]; inherit doCheck extraConfig rockspecFilename knownRockspec externalDeps nativeCheckInputs; @@ -99,7 +99,7 @@ let buildInputs = let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps; - in [ lua.pkgs.luarocks ] + in [ luarocks_bootstrap ] ++ buildInputs ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs) ++ (map (d: d.dep) externalDeps') @@ -114,7 +114,7 @@ let rocksSubdir = "${self.pname}-${self.version}-rocks"; configFile = writeTextFile { - name = pname + "-luarocks-config.lua"; + name = self.pname + "-luarocks-config.lua"; text = self.luarocks_content; }; |