summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/firefox/wrapper.nix
diff options
context:
space:
mode:
authorlinsui <linsui555@gmail.com>2022-09-07 21:36:04 +0800
committerlinsui <linsui555@gmail.com>2022-09-07 21:36:04 +0800
commit09800d7f75b2c31820b43ce9287212efba2f523b (patch)
tree538e82ee71a921d007f74165ae5128a9d1e7dc18 /pkgs/applications/networking/browsers/firefox/wrapper.nix
parent4c8a3de137f9e1aa65fd7dba3778cd16003d75f2 (diff)
downloadnixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar.gz
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar.bz2
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar.lz
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar.xz
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.tar.zst
nixpkgs-09800d7f75b2c31820b43ce9287212efba2f523b.zip
firefox wrapper: write extraPrefsFiles before extraPrefs
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ba44513ceea..3e20e6158c9 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -147,7 +147,7 @@ let
         // extraPolicies;
       };
 
-      mozillaCfg =  writeText "mozilla.cfg" ''
+      mozillaCfg = ''
         // First line must be a comment
 
         // Disables addon signature checking
@@ -155,7 +155,6 @@ let
         // Security is maintained because only user whitelisted addons
         // with a checksum can be installed
         ${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' };
-        ${extraPrefs}
       '';
 
       #############################
@@ -345,13 +344,19 @@ let
         echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js"
         echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js"
 
-        cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg}
+        cat > "$out/lib/${libName}/mozilla.cfg" << EOF
+        ${mozillaCfg}
+        EOF
 
         extraPrefsFiles=(${builtins.toString extraPrefsFiles})
         for extraPrefsFile in "''${extraPrefsFiles[@]}"; do
           cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg"
         done
 
+        cat >> "$out/lib/${libName}/mozilla.cfg" << EOF
+        ${extraPrefs}
+        EOF
+
         mkdir -p $out/lib/${libName}/distribution/extensions
 
         #############################