Merge pull request #126341 from OPNA2608/update/palemoon-29.2.1/21.11

palemoon: 29.2.0 -> 29.2.1

authored by Anderson Torres and committed by GitHub 9ebc740e 9e26d882

+14 -8
+14 -8
pkgs/applications/networking/browsers/palemoon/default.nix
··· 1 - # Compiler in stdenv MUST be a supported one for official branding 2 - # See https://developer.palemoon.org/build/linux/ 3 - # TODO assert if stdenv.cc is supported? 4 { stdenv 5 , lib 6 , fetchFromGitHub ··· 37 , gtk3 38 }: 39 40 let 41 libPath = lib.makeLibraryPath [ 42 ffmpeg ··· 46 in 47 stdenv.mkDerivation rec { 48 pname = "palemoon"; 49 - version = "29.2.0"; 50 51 src = fetchFromGitHub { 52 githubBase = "repo.palemoon.org"; 53 owner = "MoonchildProductions"; 54 repo = "Pale-Moon"; 55 rev = "${version}_Release"; 56 - sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427"; 57 fetchSubmodules = true; 58 }; 59 ··· 142 ac_add_options --enable-jemalloc 143 ac_add_options --enable-strip 144 ac_add_options --enable-devtools 145 - # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767 146 ac_add_options --enable-av1 147 148 ac_add_options --disable-eme ··· 188 ./mach install 189 190 # Fix missing icon due to wrong WMClass 191 - # TODO report upstream 192 substituteInPlace ./palemoon/branding/official/palemoon.desktop \ 193 --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' 194 desktop-file-install --dir=$out/share/applications \ ··· 202 done 203 204 # Remove unneeded SDK data from installation 205 - # TODO: move to a separate output? 206 rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} 207 208 runHook postInstall ··· 231 extensions and themes to make the browser truly your own. 232 ''; 233 homepage = "https://www.palemoon.org/"; 234 license = licenses.mpl20; 235 maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; 236 platforms = [ "i686-linux" "x86_64-linux" ];
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub ··· 34 , gtk3 35 }: 36 37 + # Only specific GCC versions are supported with branding 38 + # https://developer.palemoon.org/build/linux/ 39 + assert stdenv.cc.isGNU; 40 + assert with lib.strings; ( 41 + versionAtLeast stdenv.cc.version "4.9" 42 + && !hasPrefix "6" stdenv.cc.version 43 + && versionOlder stdenv.cc.version "11" 44 + ); 45 + 46 let 47 libPath = lib.makeLibraryPath [ 48 ffmpeg ··· 52 in 53 stdenv.mkDerivation rec { 54 pname = "palemoon"; 55 + version = "29.2.1"; 56 57 src = fetchFromGitHub { 58 githubBase = "repo.palemoon.org"; 59 owner = "MoonchildProductions"; 60 repo = "Pale-Moon"; 61 rev = "${version}_Release"; 62 + sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq"; 63 fetchSubmodules = true; 64 }; 65 ··· 148 ac_add_options --enable-jemalloc 149 ac_add_options --enable-strip 150 ac_add_options --enable-devtools 151 ac_add_options --enable-av1 152 153 ac_add_options --disable-eme ··· 193 ./mach install 194 195 # Fix missing icon due to wrong WMClass 196 + # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 197 substituteInPlace ./palemoon/branding/official/palemoon.desktop \ 198 --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' 199 desktop-file-install --dir=$out/share/applications \ ··· 207 done 208 209 # Remove unneeded SDK data from installation 210 + # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 211 rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} 212 213 runHook postInstall ··· 236 extensions and themes to make the browser truly your own. 237 ''; 238 homepage = "https://www.palemoon.org/"; 239 + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; 240 license = licenses.mpl20; 241 maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; 242 platforms = [ "i686-linux" "x86_64-linux" ];