Merge pull request #172384 from OPNA2608/update/palemoon

palemoon: 29.4.6 -> 31.0.0

authored by

Anderson Torres and committed by
GitHub
1b8121a7 b135d3b2

+13 -18
+13 -16
pkgs/applications/networking/browsers/palemoon/default.nix
··· 6 6 , dbus 7 7 , dbus-glib 8 8 , desktop-file-utils 9 - , fetchzip 9 + , fetchFromGitea 10 10 , ffmpeg 11 11 , fontconfig 12 12 , freetype ··· 39 39 # https://developer.palemoon.org/build/linux/ 40 40 assert stdenv.cc.isGNU; 41 41 assert with lib.strings; ( 42 - versionAtLeast stdenv.cc.version "4.9" 43 - && !hasPrefix "6" stdenv.cc.version 44 - && versionOlder stdenv.cc.version "11" 42 + versionAtLeast stdenv.cc.version "7.1" 43 + && versionOlder stdenv.cc.version "12" 45 44 ); 46 45 47 46 stdenv.mkDerivation rec { 48 47 pname = "palemoon"; 49 - version = "29.4.6"; 48 + version = "31.0.0"; 50 49 51 - src = fetchzip { 52 - name = "${pname}-${version}"; 53 - url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; 54 - sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g="; 50 + src = fetchFromGitea { 51 + domain = "repo.palemoon.org"; 52 + owner = "MoonchildProductions"; 53 + repo = "Pale-Moon"; 54 + rev = "${version}_Release"; 55 + fetchSubmodules = true; 56 + sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; 55 57 }; 56 58 57 59 nativeBuildInputs = [ ··· 139 141 140 142 ./mach install 141 143 142 - # Fix missing icon due to wrong WMClass 143 - # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 144 - substituteInPlace ./palemoon/branding/official/palemoon.desktop \ 145 - --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' 144 + # Install official branding stuff 146 145 desktop-file-install --dir=$out/share/applications \ 147 146 ./palemoon/branding/official/palemoon.desktop 148 - 149 - # Install official branding icons 150 147 for iconname in default{16,22,24,32,48,256} mozicon128; do 151 148 n=''${iconname//[^0-9]/} 152 149 size=$n"x"$n ··· 155 152 156 153 # Remove unneeded SDK data from installation 157 154 # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 158 - rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} 155 + rm -r $out/{include,share/idl,lib/palemoon-devel-${version}} 159 156 160 157 runHook postInstall 161 158 '';
-2
pkgs/applications/networking/browsers/palemoon/mozconfig
··· 20 20 ac_add_options --enable-devtools 21 21 ac_add_options --enable-av1 22 22 23 - ac_add_options --disable-eme 24 - ac_add_options --disable-webrtc 25 23 ac_add_options --disable-gamepad 26 24 ac_add_options --disable-tests 27 25 ac_add_options --disable-debug