diff options
| author | Colin <colin@uninsane.org> | 2023-06-28 23:39:02 +0000 |
|---|---|---|
| committer | Colin <colin@uninsane.org> | 2023-06-28 23:54:05 +0000 |
| commit | a2a5c711e7c0ff43143fc58ec08853ec063f35b3 (patch) | |
| tree | 81fe701c2972793ddb03db09329fb7ffc1cc196b | |
| parent | 2687680f2221984a83540643a0bf7c0c80b12786 (diff) | |
| download | nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar.gz nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar.bz2 nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar.lz nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar.xz nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.tar.zst nixpkgs-a2a5c711e7c0ff43143fc58ec08853ec063f35b3.zip | |
nmap: lua5_3 -> lua5_4
nmap was updated from 7.93 -> 7.94 in <https://github.com/NixOS/nixpkgs/pull/238960> as part of that update, upstream migrated from lua5.3 to lua5.4, see: <https://github.com/nmap/nmap/commit/7d57e7d6b1d96a518996054da7729202d419f4d9> nmap's configure script falls back to its vendored liblua if it can't find the expected lua version (silently). that means we lost all nix-specific lua patches that make things like cross compilation work. this patch brings the lua versions back in line to fix that regression.
| -rw-r--r-- | pkgs/tools/security/nmap/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 71a4ca5cf21..1f9084964b2 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3 +{ lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4 , pcre, libssh2 , withLua ? true }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") + (if withLua then "--with-liblua=${lua5_4}" else "--without-liblua") "--with-liblinear=included" "--without-ndiff" "--without-zenmap" |