summary refs log tree commit diff
path: root/pkgs/development/interpreters/lua-5
diff options
context:
space:
mode:
authorAlexei Robyn <shados@shados.net>2019-06-20 23:58:51 +1000
committerMatthieu Coudron <coudron@iij.ad.jp>2019-06-24 04:04:37 +0200
commitf2aa671ad784b924d4653236cf646b3e4d86e38b (patch)
tree54b51ad7bbeee3bb1ff8859d949efc06ba02c75e /pkgs/development/interpreters/lua-5
parentfa30c32db0ca70ae24dc528296339bb68ee50a3f (diff)
downloadnixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar.gz
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar.bz2
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar.lz
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar.xz
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.tar.zst
nixpkgs-f2aa671ad784b924d4653236cf646b3e4d86e38b.zip
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.
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
-rw-r--r--pkgs/development/interpreters/lua-5/build-lua-package.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 7133f54025b..74ccb91030a 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 ? []