diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-12 15:34:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-12 15:34:03 +0000 |
commit | 5d2dc6fd79291d3e46c186644b54e45adc09cfcb (patch) | |
tree | a463c746f39bfb1ff68f58f735fc100b9850e8d5 /pkgs/tools/security | |
parent | 27670961f5814c5e0276c44242bfec0ec938d084 (diff) | |
parent | 29ebc933cedd5f8285d9196405f5ac304eaf175c (diff) | |
download | nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar.gz nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar.bz2 nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar.lz nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar.xz nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.tar.zst nixlib-5d2dc6fd79291d3e46c186644b54e45adc09cfcb.zip |
Merge pull request #73164 from judaew/yara-update
yara: 3.10.0 -> 3.11.0, fix build
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/yara/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index ccebb2dbab42..e09e1e694083 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pcre +{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pcre , withCrypto ? true, openssl , enableMagic ? true, file , enableCuckoo ? true, jansson }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.11.0"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1qxqk324cyvi4n09s79786ciig1gdyhs9dnsm07hf95a3kh6w5z2"; + sha256 = "0mx3xm2a70fx8vlynkavq8gfd9w5yjcix5rx85444i2s1h6kcd0j"; }; - buildInputs = [ autoconf automake libtool pcre] + # See: https://github.com/VirusTotal/yara/issues/1036 + # TODO: This patch should not be necessary in the next release + patches = [ + (fetchpatch { + url = "https://github.com/VirusTotal/yara/commit/04df811fa61fa54390b274bfcf56d7403c184404.patch"; + sha256 = "0hsbc2k7nmk2kskll971draz0an4rmcs5v0iql47mz596vqvkzmb"; + }) + ]; + + buildInputs = [ autoconf automake libtool pcre ] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] ++ stdenv.lib.optionals enableCuckoo [ jansson ] |