uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,43 @@
{ lib, stdenv, fetchurl, pkg-config, cmake
, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2
, libmspack, systemd, Foundation, json_c, check
, rustc, rust-bindgen, rustfmt, cargo, python3
}:
stdenv.mkDerivation rec {
pname = "clamav";
version = "0.105.0";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ=";
};
patches = [
# Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed
./remove-freshclam-test.patch
./sample-cofiguration-file-install-location.patch
];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ];
buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check
] ++ lib.optional stdenv.isLinux systemd
++ lib.optional stdenv.isDarwin Foundation;
cmakeFlags = [
"-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd"
"-DAPP_CONFIG_DIRECTORY=/etc/clamav"
];
doCheck = true;
meta = with lib; {
homepage = "https://www.clamav.net";
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
license = licenses.gpl2;
maintainers = with maintainers; [ robberer qknight fpletz globin ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,20 @@
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 1460357ba..1194abc9d 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -371,15 +371,6 @@ if(ENABLE_APP)
set_property(TEST clamd_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
endif()
- add_test(NAME freshclam COMMAND ${PythonTest_COMMAND};freshclam_test.py
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- set_property(TEST freshclam PROPERTY ENVIRONMENT ${ENVIRONMENT})
- if(Valgrind_FOUND)
- add_test(NAME freshclam_valgrind COMMAND ${PythonTest_COMMAND};freshclam_test.py
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- set_property(TEST freshclam_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
- endif()
-
add_test(NAME sigtool COMMAND ${PythonTest_COMMAND};sigtool_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set_property(TEST sigtool PROPERTY ENVIRONMENT ${ENVIRONMENT})

View file

@ -0,0 +1,29 @@
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 826fff1..3cefc34 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -6,14 +6,14 @@ install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/clamd.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/freshclam.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
if(ENABLE_MILTER)
@@ -21,6 +21,6 @@ if(ENABLE_MILTER)
FILES
${CMAKE_CURRENT_SOURCE_DIR}/clamav-milter.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
endif()