diff options
author | roblabla <unfiltered@roblab.la> | 2021-02-27 14:59:08 +0100 |
---|---|---|
committer | roblabla <unfiltered@roblab.la> | 2021-03-04 19:25:28 +0100 |
commit | e7b4f9b91e6c93b67f681471f5fa68ab672d9dad (patch) | |
tree | 8026011a986178d6aaf7cd8f138d3ae19127aa59 | |
parent | 3f110f988bc567af01d56838b52d567b49603b91 (diff) | |
download | nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar.gz nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar.bz2 nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar.lz nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar.xz nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.tar.zst nixpkgs-e7b4f9b91e6c93b67f681471f5fa68ab672d9dad.zip |
yara: 4.0.1 -> 4.0.5
-rw-r--r-- | pkgs/tools/security/yara/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index f11e772390d..844004c3b9e 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, fetchpatch , fetchFromGitHub , autoreconfHook , pcre @@ -10,14 +11,14 @@ }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.5"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "0dy8jf0pdn0wilxy1pj6pqjxg7icxkwax09w54np87gl9p00f5rk"; + sha256 = "1gkdll2ygdlqy1f27a5b84gw2bq75ss7acsx06yhiss90qwdaalq"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -30,6 +31,19 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; + # If static builds are disabled, `make all-am` will fail to find libyara.a and + # cause a build failure. It appears that somewhere between yara 4.0.1 and + # 4.0.5, linking the yara binaries dynamically against libyara.so was broken. + # + # This was already fixed in yara master. Backport the patch to yara 4.0.5. + patches = [ + (fetchpatch { + name = "fix-build-with-no-static.patch"; + url = "https://github.com/VirusTotal/yara/commit/52e6866023b9aca26571c78fb8759bc3a51ba6dc.diff"; + sha256 = "074cf99j0rqiyacp60j1hkvjqxia7qwd11xjqgcr8jmfwihb38nr"; + }) + ]; + configureFlags = [ (lib.withFeature withCrypto "crypto") (lib.enableFeature enableMagic "magic") |