From 9cbf7089a65f579c5f5a2300ac2532f0e3c7da4d Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 23 Mar 2024 15:30:22 +0100
Subject: fix(flake): Use new vendored `generate_firefox_extensions` binary

---
 flake.nix                                            | 11 -----------
 flake/default.nix                                    |  3 +--
 sys/nixpkgs/pkgs/default.nix                         |  2 ++
 sys/nixpkgs/pkgs/generate_moz_extension/default.nix  | 16 ++++++++++++++++
 .../generate_firefox_extensions.nix                  | 20 ++++++++++++++++++++
 5 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 sys/nixpkgs/pkgs/generate_moz_extension/default.nix
 create mode 100644 sys/nixpkgs/pkgs/generate_moz_extension/generate_firefox_extensions.nix

diff --git a/flake.nix b/flake.nix
index cde332c8..4226578b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -184,15 +184,6 @@
     };
 
     # my bins
-    generate_firefox_extensions = {
-      url = "git+https://codeberg.org/soispha/generate_firefox_extension.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        crane.follows = "crane";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-      };
-    };
     shell_library = {
       url = "git+https://codeberg.org/soispha/shell_library.git";
       inputs = {
@@ -262,7 +253,6 @@
     treefmt-nix,
     templates,
     # my binaries
-    generate_firefox_extensions,
     shell_library,
     river_init_lesser,
     yambar_memory,
@@ -307,7 +297,6 @@
         templates
         # my binaries
         
-        generate_firefox_extensions
         shell_library
         river_init_lesser
         yambar_memory
diff --git a/flake/default.nix b/flake/default.nix
index b50b34fc..709b457b 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -21,7 +21,6 @@
   treefmt-nix,
   templates,
   # my binaries
-  generate_firefox_extensions,
   shell_library,
   river_init_lesser,
   yambar_memory,
@@ -207,7 +206,7 @@ in {
         alejandra
 
         # update
-        generate_firefox_extensions.packages."${system}".default # needed for the firefox extension update script
+        generate_firefox_extensions # needed for the firefox extension update script
         update-vim-plugins
       ];
     };
diff --git a/sys/nixpkgs/pkgs/default.nix b/sys/nixpkgs/pkgs/default.nix
index c5959bb4..e8630bb0 100644
--- a/sys/nixpkgs/pkgs/default.nix
+++ b/sys/nixpkgs/pkgs/default.nix
@@ -3,6 +3,7 @@
   sysLib,
 }: let
   comments = import ./comments;
+  generate_firefox_extensions = import ./generate_moz_extension;
   nvim_plugs = import ./plgs-pkgs;
   scripts = import ./scripts {inherit sysLib config;};
   snap-sync-forked = (import ./snap-sync-forked) {inherit sysLib;};
@@ -12,6 +13,7 @@
 
   overlays =
     comments
+    ++ generate_firefox_extensions
     ++ nvim_plugs
     ++ scripts
     ++ snap-sync-forked
diff --git a/sys/nixpkgs/pkgs/generate_moz_extension/default.nix b/sys/nixpkgs/pkgs/generate_moz_extension/default.nix
new file mode 100644
index 00000000..be734eee
--- /dev/null
+++ b/sys/nixpkgs/pkgs/generate_moz_extension/default.nix
@@ -0,0 +1,16 @@
+[
+  (
+    final: prev: {
+      generate_firefox_extensions = import ./generate_firefox_extensions.nix {
+        inherit
+          (prev)
+          rustPlatform
+          # Dependencies
+          
+          openssl
+          pkg-config
+          ;
+      };
+    }
+  )
+]
diff --git a/sys/nixpkgs/pkgs/generate_moz_extension/generate_firefox_extensions.nix b/sys/nixpkgs/pkgs/generate_moz_extension/generate_firefox_extensions.nix
new file mode 100644
index 00000000..abd95c77
--- /dev/null
+++ b/sys/nixpkgs/pkgs/generate_moz_extension/generate_firefox_extensions.nix
@@ -0,0 +1,20 @@
+{
+  rustPlatform,
+  openssl,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage {
+  pname = "generate_firefox_extensions";
+  version = "0.1.0";
+
+  src = ./.;
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+  buildInputs = [
+    openssl # needed for openssl-sys crate
+  ];
+  nativeBuildInputs = [
+    pkg-config # needed for openssl dependency
+  ];
+}
-- 
cgit 1.4.1