diff options
| author | Luna Nova <git@lunnova.dev> | 2023-02-25 17:54:50 -0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-02-28 00:56:37 +0000 |
| commit | 26c2ef229d29ff92240315e7799dd0e8e29c1b96 (patch) | |
| tree | 19cdeae3b2083d41d2134ce463ba545390495a28 | |
| parent | Merge pull request #218199 from LeSuisse/nomad-CVE-2023-0821 (diff) | |
| download | nixpkgs-origin/backport-218229-to-release-22.11.tar.gz | |
lua_5_3_compat, lua_5_4_compat: set LUA_COMPAT_5_x as LUA_COMPAT_ALL was removedorigin/backport-218229-to-release-22.11
Fixes NixOS#218227
(cherry picked from commit 0f7886405d11f6f051bbdbc2180c95c80edd4e2a)
| -rw-r--r-- | pkgs/development/interpreters/lua-5/interpreter.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index c265785b8d85..5534ecad249d 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -32,6 +32,10 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; + +compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_ALL" + else if (lib.versionOlder self.luaversion "5.4") then " -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2" + else " -DLUA_COMPAT_5_3"; in stdenv.mkDerivation rec { @@ -89,7 +93,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(${ + makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${ if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) |