From 57177df8c650a0ccff892b76516371fc14149f94 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:03:05 +0800
Subject: [PATCH 1/3] omnom: mv omnom-addons to passthru

---
 pkgs/by-name/om/omnom/package.nix | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index 8074a8ce4f94..ecfcc0e3ebb7 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -34,46 +34,12 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
-  postBuild =
-    let
-      omnom-addons = buildNpmPackage {
-        pname = "omnom-addons";
-        inherit (finalAttrs) version src;
+  postBuild = ''
+    mkdir -p $out/share/addons
 
-        npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";
-        sourceRoot = "${finalAttrs.src.name}/ext";
-        npmPackFlags = [ "--ignore-scripts" ];
-
-        nativeBuildInputs = [ zip ];
-
-        # Fix path for the `static` directory
-        postConfigure = ''
-          substituteInPlace webpack.config.js \
-          --replace-fail '"..", ".."' '".."'
-        '';
-
-        postBuild = ''
-          mkdir -p $out
-
-          zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js
-
-          pushd build
-            zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
-            zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
-          popd
-        '';
-
-        postCheck = ''
-          npm run build-test
-        '';
-      };
-    in
-    ''
-      mkdir -p $out/share/addons
-
-      # Copy Firefox and Chrome addons
-      cp -r ${omnom-addons}/*.zip $out/share/addons
-    '';
+    # Copy Firefox and Chrome addons
+    cp -r ${finalAttrs.passthru.omnom-addons}/*.zip $out/share/addons
+  '';
 
   postInstall = ''
     mkdir -p $out/share/examples
@@ -82,7 +48,41 @@ buildGoModule (finalAttrs: {
     cp config.yml_sample $out/share/examples/config.yml
   '';
 
-  passthru.tests = nixosTests.omnom;
+  passthru = {
+    omnom-addons = buildNpmPackage (finalAttrs': {
+      pname = "omnom-addons";
+      inherit (finalAttrs) version src;
+
+      npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";
+      sourceRoot = "${finalAttrs'.src.name}/ext";
+      npmPackFlags = [ "--ignore-scripts" ];
+
+      nativeBuildInputs = [ zip ];
+
+      # Fix path for the `static` directory
+      postConfigure = ''
+        substituteInPlace webpack.config.js \
+        --replace-fail '"..", ".."' '".."'
+      '';
+
+      postBuild = ''
+        mkdir -p $out
+
+        zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js
+
+        pushd build
+          zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
+          zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
+        popd
+      '';
+
+      postCheck = ''
+        npm run build-test
+      '';
+    });
+
+    tests = nixosTests.omnom;
+  };
 
   meta = {
     description = "Webpage bookmarking and snapshotting service";

From a5ecf849c51e78254a28580e9ee14febadfe3eba Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:04:47 +0800
Subject: [PATCH 2/3] omnom: install addons in postInstall

---
 pkgs/by-name/om/omnom/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index ecfcc0e3ebb7..21e88dac825d 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -34,14 +34,12 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
-  postBuild = ''
+  postInstall = ''
     mkdir -p $out/share/addons
 
     # Copy Firefox and Chrome addons
     cp -r ${finalAttrs.passthru.omnom-addons}/*.zip $out/share/addons
-  '';
 
-  postInstall = ''
     mkdir -p $out/share/examples
 
     cp -r static templates $out/share

From db462ff67ebd4457105357486d3f8a784adf08b0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:16:54 +0800
Subject: [PATCH 3/3] omnom: fix firefox extension

---
 pkgs/by-name/om/omnom/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index 21e88dac825d..837c72984180 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -70,6 +70,7 @@ buildGoModule (finalAttrs: {
 
         pushd build
           zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
+          cp manifest_ff.json manifest.json
           zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
         popd
       '';