From 7eeb109c9845584321ec244113370f33ea9bf332 Mon Sep 17 00:00:00 2001 From: caem Date: Sat, 25 Jan 2025 01:29:59 +0100 Subject: [PATCH] l --- overlays/nixpak/firefox.nix | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/overlays/nixpak/firefox.nix b/overlays/nixpak/firefox.nix index 105a9bb..2bca263 100644 --- a/overlays/nixpak/firefox.nix +++ b/overlays/nixpak/firefox.nix @@ -3,11 +3,11 @@ # https://github.com/schizofox/schizofox/blob/cdf69b2a445ff12680657a3bd44ce7c406bf2ae6/flake/modules/home-manager/default.nix { lib, ... }: final: prev: { - firefox-esr-sandboxed= let + firefox-esr = let sandboxed-firefox-esr = prev.mkNixPak { config = { sloth, ... }: { app.package = prev.firefox-esr-unwrapped; - app.binPath = "bin/firefox-esr-sandboxed"; + app.binPath = "bin/firefox-esr"; flatpak.appId = "org.mozilla.firefox"; dbus.policies = { @@ -58,7 +58,7 @@ "/sys/bus/pci" "/etc/resolv.conf" "/etc/localtime" - ["${prev.firefox-esr-unwrapped}/lib/firefox" "/app/etc/firefox"] + ["${prev.firefox-esr}/lib/firefox" "/app/etc/firefox"] (sloth.concat' sloth.xdgConfigHome "/dconf") (sloth.concat' sloth.xdgConfigHome "/gtk-2.0") (sloth.concat' sloth.xdgConfigHome "/gtk-3.0") @@ -77,21 +77,6 @@ in prev.wrapFirefox (sandboxed-firefox-esr.config.env // { gtk3 = prev.gtk3; - inherit (prev.firefox-esr) - version - meta - langPath - updateScript - pkgconfig - buildPackages - patches - extraPatches - extraPrefs - extraPolicies - nativeMessagingHosts - cfg; - }) { - applicationName = "firefox-esr-sandboxed"; - desktopName = "Firefox ESR (Sandboxed)"; - }; + inherit (prev.firefox-esr) pname meta tests; + }); }