From 4d779d3cd4f0e21548ee37d7065100a539db4799 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 26 Jul 2023 22:32:17 -0500
Subject: [PATCH] Update bypass-paywalls

---
 home/gui/firefox.nix |  2 +-
 overlays/default.nix | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix
index fdcff23..3537832 100644
--- a/home/gui/firefox.nix
+++ b/home/gui/firefox.nix
@@ -28,7 +28,7 @@ in with lib;
 				};
 				extensions = with pkgs.nur.repos.rycee.firefox-addons; [
 					bitwarden
-					#bypass-paywalls-firefox-clean
+					pkgs.bypass-paywalls
 					foxyproxy-standard
 					multi-account-containers
 					plasma-integration
diff --git a/overlays/default.nix b/overlays/default.nix
index 811474d..9a0c89a 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -26,28 +26,15 @@ let
 		(prev.callPackage file {}) else
 		prev."${og}";
 
-	buildFirefoxXpiAddon = prev.lib.makeOverridable ({ stdenv ? prev.stdenv
-	, fetchurl ? prev.fetchurl, pname, version, addonId, url, sha256, meta, ...
-	}:
-	stdenv.mkDerivation {
-		name = "${pname}-${version}";
-
-		inherit meta;
-
-		src = fetchurl { inherit url sha256; };
-
-		preferLocalBuild = true;
-		allowSubstitutes = true;
-
-		buildCommand = ''
-			dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-			mkdir -p "$dst"
-			install -v -m644 "$src" "$dst/${addonId}.xpi"
-		'';
-	});
+	buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon;
 
 in rec {
 	gregpy = myPython;
+	bypass-paywalls = final.nur.repos.rycee.firefox-addons.bypass-paywalls-clean.override {
+		version = "3.2.6.0";
+		url = "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.2.6.0-custom.xpi";
+		sha256 = "sha256-dEdqg0q4w+evky7oZ4l33GPEBEc/PFG2dCsQkVY9/3g=";
+	};
 
 	## Testing adding python packages in the correct manner
 	pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [