diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-05-15 10:34:52 +0000 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-15 09:33:46 -0700 |
commit | 1758c0ac6531a6840ed78769022fd63765d713e1 (patch) | |
tree | 1514e0ec7455654d297860d52c6f0580961e0108 /pkgs/development | |
parent | 3f5ecec6133f6dbea729a0febcefe396432ed5d1 (diff) |
lua5_4: fix eval
This patch was removed in 34f8d7e15a3 ("lua: one dso patch to rule
them all"), and the reference to it in lua5_4 was removed at the time,
but it seems to have found its way back somehow (probably through a
merge?).
(cherry picked from commit 5b278213a2bcf07c3dc2f71305100bba9010e8f5)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 3f525e6d6f0d..95b593fb5dbb 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -6,11 +6,7 @@ rec { sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; - patches = if stdenv.isDarwin then [ ./5.4.darwin.patch ] else [ - # build lua as a shared library as well, MIT-licensed from - # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk - ./liblua.so.patch - ]; + patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; }; lua5_4_compat = lua5_4.override({ |