diff options
author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-22 08:11:44 +0100 |
---|---|---|
committer | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-22 08:11:44 +0100 |
commit | 67a5c0315730d318ac2a7930810d1240591dc8b0 (patch) | |
tree | 23d7d4905bc13d06109c8b2eadddcb32da5eeb84 | |
parent | 5b874cadbf5059da4975f91bbb5b39543bbd47bf (diff) | |
download | nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar.gz nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar.bz2 nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar.lz nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar.xz nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.tar.zst nixlib-67a5c0315730d318ac2a7930810d1240591dc8b0.zip |
Revert "palemoon: 29.4.4 -> 30.0.0"
This reverts commit ab6bd24835713a5b672e10c9f7621c5dd4854a48. The v30 milestone has been recalled temporarily: https://forum.palemoon.org/viewtopic.php?f=1&t=28044
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/mozconfig | 4 |
2 files changed, 22 insertions, 14 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 49dcfe0f9c48..e33ff3f3ca6e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -6,7 +6,7 @@ , dbus , dbus-glib , desktop-file-utils -, fetchFromGitea +, fetchzip , ffmpeg , fontconfig , freetype @@ -44,15 +44,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "30.0.0"; - - src = fetchFromGitea { - domain = "repo.palemoon.org"; - owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = "${version}_Release"; - fetchSubmodules = true; - sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f"; + version = "29.4.4"; + + src = fetchzip { + name = "${pname}-${version}"; + url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; + sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc="; }; nativeBuildInputs = [ @@ -140,15 +137,24 @@ stdenv.mkDerivation rec { ./mach install - # Install official branding stuff (desktop file & icons) + # Fix missing icon due to wrong WMClass + # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 + substituteInPlace ./palemoon/branding/official/palemoon.desktop \ + --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ - ./other-licenses/branding/palemoon/official/palemoon.desktop + ./palemoon/branding/official/palemoon.desktop + + # Install official branding icons for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done + # Remove unneeded SDK data from installation + # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 + rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} + runHook postInstall ''; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index c7674d342c25..0eab96e58469 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -12,7 +12,7 @@ _BUILD_64=@build64@ _GTK_VERSION=@gtkversion@ # Standard build options for Pale Moon -ac_add_options --enable-application=browser +ac_add_options --enable-application=palemoon ac_add_options --enable-optimize="-O2 -w" ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION ac_add_options --enable-jemalloc @@ -20,6 +20,8 @@ ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 +ac_add_options --disable-eme +ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug |