diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-03-20 17:14:38 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-20 17:14:38 -0300 |
commit | bef8290da14cd30c2f4155c8c52b822ed56b2ebf (patch) | |
tree | e8e39485384890542b5a55b6b066eba6aef21eb7 | |
parent | 17988778f188a74576fba156c0e91f7b299d46f8 (diff) | |
parent | ab6bd24835713a5b672e10c9f7621c5dd4854a48 (diff) | |
download | nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar.gz nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar.bz2 nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar.lz nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar.xz nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.tar.zst nixpkgs-bef8290da14cd30c2f4155c8c52b822ed56b2ebf.zip |
Merge pull request #164868 from OPNA2608/update/palemoon
palemoon: 29.4.4 -> 30.0.0
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/mozconfig | 4 |
2 files changed, 14 insertions, 22 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index e33ff3f3ca6..49dcfe0f9c4 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 @@ -44,12 +44,15 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.4"; - - src = fetchzip { - name = "${pname}-${version}"; - url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc="; + version = "30.0.0"; + + src = fetchFromGitea { + domain = "repo.palemoon.org"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "${version}_Release"; + fetchSubmodules = true; + sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f"; }; nativeBuildInputs = [ @@ -137,24 +140,15 @@ 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 & icons) desktop-file-install --dir=$out/share/applications \ - ./palemoon/branding/official/palemoon.desktop - - # Install official branding icons + ./other-licenses/branding/palemoon/official/palemoon.desktop for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done - # 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}} - runHook postInstall ''; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index 0eab96e5846..c7674d342c2 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -12,7 +12,7 @@ _BUILD_64=@build64@ _GTK_VERSION=@gtkversion@ # Standard build options for Pale Moon -ac_add_options --enable-application=palemoon +ac_add_options --enable-application=browser ac_add_options --enable-optimize="-O2 -w" ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION ac_add_options --enable-jemalloc @@ -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 |