diff --git a/fix-firefox.nix b/fix-firefox.nix index a9a0ea1..f65c102 100644 --- a/fix-firefox.nix +++ b/fix-firefox.nix @@ -7,12 +7,20 @@ firefox-unwrapped = stdenv.mkDerivation { inherit (firefox-unwrapped) name version; + nativeBuildInputs = [ fastjar ]; + buildCommand = '' mkdir -p $out cp -ra ${firefox-unwrapped}/. $out/. chmod +w -R $out sed -i "s|${firefox-unwrapped}|$out|g" $out/bin/firefox - sed -i 's/reserved="true"/ /g' $out/lib/firefox/browser/omni.ja + + 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 + patch $f <${./fix-firefox.patch} + fastjar uf $j $f ''; inherit (firefox-unwrapped) meta; diff --git a/fix-firefox.patch b/fix-firefox.patch new file mode 100644 index 0000000..9a69fd2 --- /dev/null +++ b/fix-firefox.patch @@ -0,0 +1,20 @@ +--- 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 +@@ -9,7 +9,7 @@ + .label = Zoom + + window-new-shortcut = +- .key = N ++ .keycode = VK_F19 + + window-minimize-shortcut = + .key = M +@@ -185,7 +185,7 @@ + ## global menu. + + quit-app-shortcut = +- .key = Q ++ .keycode = VK_F20 + + help-shortcut = + .key = ?