From 3f3141ed2a979c0b6cc643b650547a674eb30193 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Tue, 31 Oct 2023 17:46:35 +0100
Subject: fix(hm/conf/firefox/pkg): Adapt to new override options in nixpkgs

---
 hm/soispha/conf/firefox/package.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'hm/soispha/conf')

diff --git a/hm/soispha/conf/firefox/package.nix b/hm/soispha/conf/firefox/package.nix
index f38c8bbe..5d2b242e 100644
--- a/hm/soispha/conf/firefox/package.nix
+++ b/hm/soispha/conf/firefox/package.nix
@@ -11,21 +11,10 @@
   base_package ? pkgs.firefox,
 }: let
   pkg = base_package.override (old: {
+    extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" autoConfig)];
+    nativeMessagingHosts = old.nativeMessagingHosts or [] ++ extraNativeMessagingHosts;
+    cfg = (old.cfg or {}) // wrapperConfig;
     inherit extraPolicies;
-    extraPrefs = autoConfig;
-    extraNativeMessagingHosts =
-      old.extraNativeMessagingHosts
-      or []
-      ++ extraNativeMessagingHosts;
-    cfg = let
-      # copy-pasted from the wrapper; TODO: figure out fix
-      applicationName = base_package.binaryName or (lib.getName base_package);
-
-      oldCfg = old.cfg or {};
-      nixpkgsConfig = pkgs.config.${applicationName} or {};
-      optionConfig = wrapperConfig;
-    in
-      oldCfg // nixpkgsConfig // optionConfig;
   });
 in
   pkg
-- 
cgit 1.4.1