summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-02-10 13:17:43 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-02-17 09:57:26 +0000
commitd3d319ca53fe3c427ac4ac962878d293be3cf6b3 (patch)
tree7f93b2dbc7b534d0c4baa609e31b83dfd951ec26
parentresholve: oildev: disable libc tests unconditionally (diff)
downloadnixpkgs-origin/backport-287755-to-release-23.11.tar.gz
yara: make patch unconditionalorigin/backport-287755-to-release-23.11
(cherry picked from commit 5e84b19d911434d206bee21259afc60ce3527b00)
-rw-r--r--pkgs/tools/security/yara/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 946a424ca681..a03763603382 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
hash = "sha256-axHFy7YwLhhww+lh+ORyW6YG+T385msysIHK5SMyhMk=";
};
- # FIXME: make unconditional on staging
- patches = lib.optionals (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) [
+ patches = [
(fetchpatch {
name = "musl.patch";
url = "https://github.com/VirusTotal/yara/commit/515ed861cf30e154b14a69ffd46c347fb81df72f.patch";