zmap: 2.1.1 -> 3.0.0
ChangeLog: https://github.com/zmap/zmap/releases/tag/v3.0.0
This commit is contained in:
parent
e9e7adffe8
commit
b4071d74b1
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 8bd825f..694d9b2 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -72,6 +72,8 @@ if(WITH_JSON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_definitions("-DJSON")
|
|
||||||
+ # JSON_CFLAGS is a list, i.e. semicolon-separated, convert it to space-separated
|
|
||||||
+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
|
|
||||||
endif()
|
|
||||||
|
|
|
@ -1,28 +1,22 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp
|
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp
|
||||||
, libpcap
|
, libpcap, libunistring
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zmap";
|
pname = "zmap";
|
||||||
version = "2.1.1";
|
version = "3.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zmap";
|
owner = "zmap";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs";
|
sha256 = "sha256-OJZKcnsuBi3z/AI05RMBitgn01bhVTqx2jFYJLuIJk4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# fix build with json-c 0.14 https://github.com/zmap/zmap/pull/609
|
|
||||||
./cmake-json-0.14-fix.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];
|
cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];
|
||||||
dontUseCmakeBuildDir = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ];
|
nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ];
|
||||||
buildInputs = [ libjson json_c gmp libpcap ];
|
buildInputs = [ libjson json_c gmp libpcap libunistring ];
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue