fix firefox addons package

2 files changed, 8 insertions, 5 deletions

diff --git a/flake.nix b/flake.nix
index 52d1b15..6ecbda8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,11 @@
 {
-  outputs = { self, flake-utils }: {
+  outputs = { self, nur, ... }: {
     nixosModules.personal = import ./modules/nixos;
-    overlays.personal = self: super: {
-      personal = import ./pkgs self;
+    overlays = {
+      default = self.overlays.personal;
+      personal = self: super: {
+        personal = import ./pkgs (self.extend nur.overlay);
+      };
     };
   };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3def90a..14cbfaa 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,7 @@
 pkgs:
 
 let
-  firefoxAddons = pkgs.callPackage ./firefox/addons { };
+  firefoxAddons = pkgs.callPackage ./firefox/addons { inherit (pkgs.nur.repos.rycee) buildFirefoxXpiAddon; };
   gitignores = pkgs.callPackage ./gitignore { };
   icons = pkgs.callPackage ./icons { };
   personal =
@@ -11,7 +11,7 @@ let
     } //
     # firefox packages
     firefoxAddons // {
-      arkenfoxUserJs = ./firefox/user-js/arkenfox.nix;
+      arkenfoxUserJs = pkgs.callPackage ./firefox/user-js/arkenfox.nix { };
     } //
     # font metadata
     {