palemoon: 28.16.0 -> 28.17.0 (#107329)

This commit is contained in:
Christoph Neidahl 2020-12-27 19:07:57 +01:00 committed by GitHub
parent dcbe3b4779
commit b8f2c6fe42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils { stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils
, pkgconfig, autoconf213, alsaLib, bzip2, cairo , pkg-config, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, wrapGAppsHook , libnotify, libstartup_notification, wrapGAppsHook
, libGLU, libGL, perl, python2, libpulseaudio , libGLU, libGL, perl, python2, libpulseaudio
@ -11,19 +11,19 @@
let let
libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ];
gtkVersion = if withGTK3 then "3" else "2"; gtkVersion = if withGTK3 then "3" else "2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "palemoon"; pname = "palemoon";
version = "28.16.0"; version = "28.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
githubBase = "repo.palemoon.org"; githubBase = "repo.palemoon.org";
owner = "MoonchildProductions"; owner = "MoonchildProductions";
repo = "Pale-Moon"; repo = "Pale-Moon";
rev = "${version}_Release"; rev = "${version}_Release";
sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -43,11 +43,11 @@ in stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL libstartup_notification libGLU libGL
libpulseaudio unzip yasm zip zlib libpulseaudio unzip yasm zip zlib
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
configurePhase = '' configurePhase = ''
export MOZCONFIG=$(pwd)/mozconfig export MOZCONFIG=$PWD/mozconfig
export MOZ_NOSPAM=1 export MOZ_NOSPAM=1
# Keep this similar to the official .mozconfig file, # Keep this similar to the official .mozconfig file,
@ -114,18 +114,18 @@ in stdenv.mkDerivation rec {
' '
''; '';
buildPhase = "$src/mach build"; buildPhase = "./mach build";
installPhase = '' installPhase = ''
$src/mach install ./mach install
desktop-file-install --dir=$out/share/applications \ desktop-file-install --dir=$out/share/applications \
$src/palemoon/branding/official/palemoon.desktop ./palemoon/branding/official/palemoon.desktop
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
install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done done
''; '';