From d3dd4a1adc71ffa4b064c584908c8e227a67fd96 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 9 Mar 2026 14:08:55 +0100
Subject: [PATCH 1/2] bukubrow: use structuredAttrs instead of passAsFile

Also avoid using substituteAll.
Together these changes make the derivation compatible with __structuredAttrs.
---
 pkgs/by-name/bu/bukubrow/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix
index 098cebca5692..c198adcbb755 100644
--- a/pkgs/by-name/bu/bukubrow/package.nix
+++ b/pkgs/by-name/bu/bukubrow/package.nix
@@ -29,10 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ sqlite ];
 
-  passAsFile = [
-    "firefoxManifest"
-    "chromeManifest"
-  ];
   firefoxManifest = builtins.toJSON (
     manifest
     // {
@@ -46,14 +42,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     }
   );
   postBuild = ''
-    substituteAll $firefoxManifestPath firefox.json
-    substituteAll $chromeManifestPath chrome.json
+    printf "%s" "$firefoxManifest" > firefox.json
+    substituteInPlace firefox.json \
+      --replace-fail "@out@" "$out"
+    printf "%s" "$chromeManifest" > chrome.json
+    substituteInPlace chrome.json \
+      --replace-fail "@out@" "$out"
   '';
   postInstall = ''
     install -Dm0644 firefox.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json
     install -Dm0644 chrome.json $out/etc/chromium/native-messaging-hosts/com.samhh.bukubrow.json
   '';
 
+  __structuredAttrs = true;
+
   meta = {
     description = "WebExtension for Buku, a command-line bookmark manager";
     homepage = "https://github.com/SamHH/bukubrow-host";

From 04a5570bfed40992e81d3f57d9f2867771dba3b4 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 9 Mar 2026 14:09:11 +0100
Subject: [PATCH 2/2] bukubrow: use tag/hash instead of rev/sha256

---
 pkgs/by-name/bu/bukubrow/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix
index c198adcbb755..fd9070899d38 100644
--- a/pkgs/by-name/bu/bukubrow/package.nix
+++ b/pkgs/by-name/bu/bukubrow/package.nix
@@ -21,8 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SamHH";
     repo = "bukubrow-host";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
   cargoHash = "sha256-mCPJE9WW14NtahbMnDcE+0xXl5w25dzerPy3wv78l20=";