diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-05-10 22:36:04 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-05-11 01:56:29 +0000 |
| commit | e1273b235c6d3e82c1aa47c003f7f82ef2c7d375 (patch) | |
| tree | bacf20b2f07c8330e009aaf39124b6a43ff6b05b | |
| parent | Merge pull request #166357 from NixOS/backport-163847-to-release-21.11 (diff) | |
| download | nixpkgs-origin/backport-172384-to-release-21.11.tar.gz | |
palemoon: 29.4.6 -> 31.0.0origin/backport-172384-to-release-21.11
(cherry picked from commit 0ae3ed37c19884850bd961b1576c1c150d9fb480)
| -rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/palemoon/mozconfig | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 70442e47e66b..1531743c7864 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 -, fetchzip +, fetchFromGitea , ffmpeg , fontconfig , freetype @@ -39,19 +39,21 @@ # https://developer.palemoon.org/build/linux/ assert stdenv.cc.isGNU; assert with lib.strings; ( - versionAtLeast stdenv.cc.version "4.9" - && !hasPrefix "6" stdenv.cc.version - && versionOlder stdenv.cc.version "11" + versionAtLeast stdenv.cc.version "7.1" + && versionOlder stdenv.cc.version "12" ); stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.6"; + version = "31.0.0"; - src = fetchzip { - name = "${pname}-${version}"; - url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g="; + src = fetchFromGitea { + domain = "repo.palemoon.org"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "${version}_Release"; + fetchSubmodules = true; + sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; }; nativeBuildInputs = [ @@ -139,14 +141,9 @@ stdenv.mkDerivation rec { ./mach install - # 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' + # Install official branding stuff desktop-file-install --dir=$out/share/applications \ ./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 @@ -155,7 +152,7 @@ stdenv.mkDerivation rec { # 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}} + rm -r $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 0eab96e58469..65143fdac187 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -20,8 +20,6 @@ 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 |