diff options
| author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
| commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
| tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/development/lua-modules | |
| parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) | |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 9139befe0204..fd99a70de3a6 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -42,7 +42,8 @@ with super; ]; # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null; + NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin + "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua @@ -253,7 +254,7 @@ with super; # Upstreams: # 5.1: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz # 5.2: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; patches = [ ./luuid.patch ]; |