fix firefox patching

fix-firefox.nix

@@ -7,7 +7,7 @@
     firefox-unwrapped = stdenv.mkDerivation {
       inherit (firefox-unwrapped) name version;
 
-      nativeBuildInputs = [ fastjar ];
+      nativeBuildInputs = [ unzip zip ];
 
       buildCommand = ''
         mkdir -p $out
@@ -16,11 +16,13 @@
         sed -i "s|${firefox-unwrapped}|$out|g" $out/bin/firefox
 
         j=$out/lib/firefox/browser/omni.ja
-        # f=chrome/browser/content/browser/browser.xhtml
         f=localization/en-US/browser/browserSets.ftl
-        fastjar xf $j $f
+        mkdir browser
+        cd browser
+        unzip $j
         patch $f <${./fix-firefox.patch}
-        fastjar uf $j $f
+        rm $j
+        zip -0DXqr $j *
       '';
 
       inherit (firefox-unwrapped) meta;

fix-firefox.patch

@@ -1,20 +1,29 @@
 --- localization/en-US/browser/browserSets.ftl~	2020-08-31 11:28:51.148881026 +0200
-+++ localization/en-US/browser/browserSets.ftl	2020-08-31 11:35:37.659977936 +0200
++++ localization/en-US/browser/browserSets.ftl	2020-08-31 16:36:03.174954971 +0200
 @@ -9,7 +9,7 @@
      .label = Zoom
  
  window-new-shortcut =
 -    .key = N
-+    .keycode = VK_F19
++    .keycode = VK_F20
  
  window-minimize-shortcut =
      .key = M
+@@ -18,7 +18,7 @@
+     .key = W
+ 
+ tab-new-shortcut =
+-    .key = T
++    .keycode = VK_F19
+ 
+ location-open-shortcut =
+     .key = L
 @@ -185,7 +185,7 @@
  ## global menu.
  
  quit-app-shortcut =
 -    .key = Q
-+    .keycode = VK_F20
++    .keycode = VK_F18
  
  help-shortcut =
      .key = ?