about summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2020-05-16 22:13:56 +0100
committerRobert Scott <code@humanleg.org.uk>2020-05-16 22:13:56 +0100
commitd478d7a65b359e405b334e4b36845283e7c0b2cf (patch)
treefa885311eb21ad5e3944886b33f631caa4aba4d8 /pkgs/tools/security
parent5f19ec3bc4f93a2408c7f46c73cd0659bca604be (diff)
downloadnixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar.gz
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar.bz2
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar.lz
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar.xz
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.tar.zst
nixlib-d478d7a65b359e405b334e4b36845283e7c0b2cf.zip
aflplusplus: remove clang_9 and llvm_9 specificity
i've successfully built this with llvm 8 and 6 now - make this easier to
override
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/aflplusplus/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index 332e79e70e1d..a0ef58ae8b61 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper
-, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp
+, clang, llvm, gcc, which, libcgroup, python, perl, gmp
 , file, wine ? null, fetchpatch
 }:
 
@@ -29,16 +29,16 @@ let
 
     # Note: libcgroup isn't needed for building, just for the afl-cgroup
     # script.
-    nativeBuildInputs = [ makeWrapper which clang_9 gcc ];
-    buildInputs = [ llvm_9 python gmp ]
+    nativeBuildInputs = [ makeWrapper which clang gcc ];
+    buildInputs = [ llvm python gmp ]
       ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython;
 
 
     postPatch = ''
       # Replace the CLANG_BIN variables with the correct path
       substituteInPlace llvm_mode/afl-clang-fast.c \
-        --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \
-        --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \
+        --replace "CLANGPP_BIN" '"${clang}/bin/clang++"' \
+        --replace "CLANG_BIN" '"${clang}/bin/clang"' \
         --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")"
 
       # Replace "gcc" and friends with full paths in afl-gcc