From 4f8dacc1998d4b52c945b2367a93bf91b17be4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 16 Jun 2025 00:15:06 +0200
Subject: [PATCH 1/3] libblake3: split dev outputs from runtime

---
 pkgs/by-name/li/libblake3/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index 72ce99baa6bc..439634017266 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "libblake3";
   version = "1.8.2";
 
+  outputs = [
+    "out"
+    "dev"
+  ];
+
   src = fetchFromGitHub {
     owner = "BLAKE3-team";
     repo = "BLAKE3";

From 867c79b3c9f7fc3af5db488e866da6cf965353c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 16 Jun 2025 00:16:02 +0200
Subject: [PATCH 2/3] libutil: fix splicing of libblake3

---
 .../package-management/nix/modular/src/libutil/package.nix    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
index 3e96aa0660c8..7ac84405cd24 100644
--- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
@@ -27,9 +27,7 @@ mkMesonLibrary (finalAttrs: {
     [
       brotli
     ]
-    ++ lib.optional (lib.versionAtLeast version "2.27") [
-      libblake3
-    ]
+    ++ lib.optional (lib.versionAtLeast version "2.27") libblake3
     ++ [
       libsodium
       openssl

From 4853556b1f386a72aa3b56672f28083724257d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 18 Jun 2025 16:59:34 +0200
Subject: [PATCH 3/3] nix: fix another lib.optional taking a list

---
 pkgs/tools/package-management/nix/common-autoconf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index 01b87cddc17d..1d7ed8cba374 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -111,7 +111,7 @@ let
       "shadowstack"
     ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
-    nativeInstallCheckInputs = lib.optional atLeast224 [
+    nativeInstallCheckInputs = lib.optionals atLeast224 [
       git
       man
     ];