diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-25 14:04:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-25 14:04:12 +0200 |
| commit | 145a620802ca209b8a5fd29b6376cd77e44b48d4 (patch) | |
| tree | f89e4915e6b5b56f2612fb172b3219fd3f0c345b /pkgs/development/interpreters | |
| parent | dafee3d91af16ec7cc4962b194330ef621f664bd (diff) | |
| parent | cd83cecdc8accee367d3d09171024464b0fb98ad (diff) | |
| download | nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar.gz nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar.bz2 nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar.lz nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar.xz nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.tar.zst nixlib-145a620802ca209b8a5fd29b6376cd77e44b48d4.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1527134
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/build-lua-package.nix | 4 |
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 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 ? [] |