From fb539cb40e4d2ebf3085a5ef94364a61c5863071 Mon Sep 17 00:00:00 2001 From: silvanshade Date: Tue, 29 Apr 2025 11:42:23 -0600 Subject: [PATCH] libblake3: fix duplicate patch fields --- pkgs/by-name/li/libblake3/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index c3658710e0c83..72ce99baa6bc2 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npCtM8nOFU8Tcu//IykjMs8aLU12d93+mIfKuxHkuaQ="; relative = "c"; }) + # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch"; + hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; + relative = "c"; + }) ]; sourceRoot = finalAttrs.src.name + "/c"; @@ -38,15 +44,6 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_11 ]; - patches = [ - # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch"; - hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; - relative = "c"; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "BLAKE3_USE_TBB" useTBB) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))