From f2aa671ad784b924d4653236cf646b3e4d86e38b Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Thu, 20 Jun 2019 23:58:51 +1000 Subject: [PATCH] luajitPackages: Improve derivation names `"lua" + lua.luaversion + "-"` resolves to "lua51-" for both Lua 5.1 and LuaJIT packages. With this, LuaJIT packages instead get `lua.name + "-"`, which currently resolves to "luajit-2.1.0-beta3-". This makes it easy to distinguish the two in store paths etc. --- pkgs/development/interpreters/lua-5/build-lua-package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 7133f54025b1..74ccb91030aa 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -12,7 +12,9 @@ name ? "${attrs.pname}-${attrs.version}" , version # by default prefix `name` e.g. "lua5.2-${name}" -, namePrefix ? "lua" + lua.luaversion + "-" +, namePrefix ? if lua.pkgs.isLuaJIT + then lua.name + "-" + else "lua" + lua.luaversion + "-" # Dependencies for building the package , buildInputs ? []