Merge pull request #172384 from OPNA2608/update/palemoon
palemoon: 29.4.6 -> 31.0.0
This commit is contained in:
commit
1b8121a715
2 changed files with 13 additions and 18 deletions
|
@ -6,7 +6,7 @@
|
||||||
, dbus
|
, dbus
|
||||||
, dbus-glib
|
, dbus-glib
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, fetchzip
|
, fetchFromGitea
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, fontconfig
|
, fontconfig
|
||||||
, freetype
|
, freetype
|
||||||
|
@ -39,19 +39,21 @@
|
||||||
# https://developer.palemoon.org/build/linux/
|
# https://developer.palemoon.org/build/linux/
|
||||||
assert stdenv.cc.isGNU;
|
assert stdenv.cc.isGNU;
|
||||||
assert with lib.strings; (
|
assert with lib.strings; (
|
||||||
versionAtLeast stdenv.cc.version "4.9"
|
versionAtLeast stdenv.cc.version "7.1"
|
||||||
&& !hasPrefix "6" stdenv.cc.version
|
&& versionOlder stdenv.cc.version "12"
|
||||||
&& versionOlder stdenv.cc.version "11"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "palemoon";
|
pname = "palemoon";
|
||||||
version = "29.4.6";
|
version = "31.0.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchFromGitea {
|
||||||
name = "${pname}-${version}";
|
domain = "repo.palemoon.org";
|
||||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
owner = "MoonchildProductions";
|
||||||
sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g=";
|
repo = "Pale-Moon";
|
||||||
|
rev = "${version}_Release";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -139,14 +141,9 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
./mach install
|
./mach install
|
||||||
|
|
||||||
# Fix missing icon due to wrong WMClass
|
# Install official branding stuff
|
||||||
# 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 \
|
desktop-file-install --dir=$out/share/applications \
|
||||||
./palemoon/branding/official/palemoon.desktop
|
./palemoon/branding/official/palemoon.desktop
|
||||||
|
|
||||||
# Install official branding icons
|
|
||||||
for iconname in default{16,22,24,32,48,256} mozicon128; do
|
for iconname in default{16,22,24,32,48,256} mozicon128; do
|
||||||
n=''${iconname//[^0-9]/}
|
n=''${iconname//[^0-9]/}
|
||||||
size=$n"x"$n
|
size=$n"x"$n
|
||||||
|
@ -155,7 +152,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# Remove unneeded SDK data from installation
|
# Remove unneeded SDK data from installation
|
||||||
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
|
# 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
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -20,8 +20,6 @@ ac_add_options --enable-strip
|
||||||
ac_add_options --enable-devtools
|
ac_add_options --enable-devtools
|
||||||
ac_add_options --enable-av1
|
ac_add_options --enable-av1
|
||||||
|
|
||||||
ac_add_options --disable-eme
|
|
||||||
ac_add_options --disable-webrtc
|
|
||||||
ac_add_options --disable-gamepad
|
ac_add_options --disable-gamepad
|
||||||
ac_add_options --disable-tests
|
ac_add_options --disable-tests
|
||||||
ac_add_options --disable-debug
|
ac_add_options --disable-debug
|
||||||
|
|
Loading…
Reference in a new issue