Merge pull request #126341 from OPNA2608/update/palemoon-29.2.1/21.11
palemoon: 29.2.0 -> 29.2.1
This commit is contained in:
commit
9ebc740e96
1 changed files with 14 additions and 8 deletions
|
@ -1,6 +1,3 @@
|
|||
# Compiler in stdenv MUST be a supported one for official branding
|
||||
# See https://developer.palemoon.org/build/linux/
|
||||
# TODO assert if stdenv.cc is supported?
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
@ -37,6 +34,15 @@
|
|||
, gtk3
|
||||
}:
|
||||
|
||||
# Only specific GCC versions are supported with branding
|
||||
# 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"
|
||||
);
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
ffmpeg
|
||||
|
@ -46,14 +52,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.2.0";
|
||||
version = "29.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
githubBase = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427";
|
||||
sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -142,7 +148,6 @@ stdenv.mkDerivation rec {
|
|||
ac_add_options --enable-jemalloc
|
||||
ac_add_options --enable-strip
|
||||
ac_add_options --enable-devtools
|
||||
# Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767
|
||||
ac_add_options --enable-av1
|
||||
|
||||
ac_add_options --disable-eme
|
||||
|
@ -188,7 +193,7 @@ stdenv.mkDerivation rec {
|
|||
./mach install
|
||||
|
||||
# Fix missing icon due to wrong WMClass
|
||||
# TODO report upstream
|
||||
# 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 \
|
||||
|
@ -202,7 +207,7 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
|
||||
# Remove unneeded SDK data from installation
|
||||
# TODO: move to a separate output?
|
||||
# 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
|
||||
|
@ -231,6 +236,7 @@ stdenv.mkDerivation rec {
|
|||
extensions and themes to make the browser truly your own.
|
||||
'';
|
||||
homepage = "https://www.palemoon.org/";
|
||||
changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
|
|
Loading…
Reference in a new issue