tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
zmap: support json_c-0.14
Martin Milata
5 years ago
b39c3a1a
9aadc464
+18
2 changed files
expand all
collapse all
unified
split
pkgs
tools
security
zmap
cmake-json-0.14-fix.patch
default.nix
+13
pkgs/tools/security/zmap/cmake-json-0.14-fix.patch
reviewed
···
1
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
2
+
index 8bd825f..694d9b2 100644
3
3
+
--- a/CMakeLists.txt
4
4
+
+++ b/CMakeLists.txt
5
5
+
@@ -72,6 +72,8 @@ if(WITH_JSON)
6
6
+
endif()
7
7
+
8
8
+
add_definitions("-DJSON")
9
9
+
+ # JSON_CFLAGS is a list, i.e. semicolon-separated, convert it to space-separated
10
10
+
+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
11
11
+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
12
12
+
endif()
13
13
+
+5
pkgs/tools/security/zmap/default.nix
reviewed
···
13
13
sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs";
14
14
};
15
15
16
16
+
patches = [
17
17
+
# fix build with json-c 0.14 https://github.com/zmap/zmap/pull/609
18
18
+
./cmake-json-0.14-fix.patch
19
19
+
];
20
20
+
16
21
cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];
17
22
dontUseCmakeBuildDir = true;
18
23