git.iko.soy/typeable/nixpkgs
on master help sign in
palemoon: 29.1.1 -> 29.2.0
commit668264d220377c74638dc3d14a67119837c773f0 authorOPNA2608 <christoph.neidahl@gmail.com> dateThu 29 Apr 2021, 12:51 (6 years ago) parentba6f0e8
2 files changed+106−33
pkgs/applications/networking/browsers/palemoon/default.nix+105−29 pkgs/top-level/all-packages.nix+1−4
pkgs/applications/networking/browsers/palemoon/default.nix+105−29
@@ -1,29 +1,59 @@
1−{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils
2−, pkg-config, autoconf213, alsaLib, bzip2, cairo
3−, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
4−, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
5−, libnotify, libstartup_notification, wrapGAppsHook
6−, libGLU, libGL, perl, python2, libpulseaudio
7−, unzip, xorg, wget, which, yasm, zip, zlib
8−
9−, withGTK3 ? true, gtk3
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
7+, writeScript
8+, alsaLib
9+, autoconf213
10+, cairo
11+, desktop-file-utils
12+, dbus
13+, dbus-glib
14+, ffmpeg
15+, fontconfig
16+, freetype
17+, gnome2
18+, gnum4
19+, gtk2
20+, libevent
21+, libGL
22+, libGLU
23+, libnotify
24+, libpulseaudio
25+, libstartup_notification
26+, perl
27+, pkg-config
28+, python2
29+, unzip
30+, which
31+, wrapGAppsHook
32+, xorg
33+, yasm
34+, zip
35+, zlib
36+, withGTK3 ? true
37+, gtk3
1038}:
1139
1240let
13−
14− libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ];
41+ libPath = lib.makeLibraryPath [
42+ ffmpeg
43+ libpulseaudio
44+ ];
1545 gtkVersion = if withGTK3 then "3" else "2";
16−
17−in stdenv.mkDerivation rec {
46+in
47+stdenv.mkDerivation rec {
1848 pname = "palemoon";
19− version = "29.1.1";
49+ version = "29.2.0";
2050
2151 src = fetchFromGitHub {
2252 githubBase = "repo.palemoon.org";
2353 owner = "MoonchildProductions";
2454 repo = "Pale-Moon";
2555 rev = "${version}_Release";
26− sha256 = "1ppdmj816zwccb0l0mgpq14ckdwg785wmqz41wran0nl63fg6i1x";
56+ sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427";
2757 fetchSubmodules = true;
2858 };
2959
@@ -43,24 +73,55 @@ in stdenv.mkDerivation rec {
4373 '';
4474
4575 nativeBuildInputs = [
46− desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip
76+ autoconf213
77+ desktop-file-utils
78+ gnum4
79+ perl
80+ pkg-config
81+ python2
82+ unzip
83+ which
84+ wrapGAppsHook
85+ yasm
86+ zip
4787 ];
4888
4989 buildInputs = [
50− alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
51− gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
52− libstartup_notification libGLU libGL
53− libpulseaudio yasm zip zlib
90+ alsaLib
91+ cairo
92+ dbus
93+ dbus-glib
94+ ffmpeg
95+ fontconfig
96+ freetype
97+ gnome2.GConf
98+ gtk2
99+ libevent
100+ libGL
101+ libGLU
102+ libnotify
103+ libpulseaudio
104+ libstartup_notification
105+ zlib
54106 ]
55107 ++ (with xorg; [
56− libX11 libXext libXft libXi libXrender libXScrnSaver
57− libXt pixman xorgproto
108+ libX11
109+ libXext
110+ libXft
111+ libXi
112+ libXrender
113+ libXScrnSaver
114+ libXt
115+ pixman
116+ xorgproto
58117 ])
59118 ++ lib.optional withGTK3 gtk3;
60119
61120 enableParallelBuilding = true;
62121
63122 configurePhase = ''
123+ runHook preConfigure
124+
64125 export MOZCONFIG=$PWD/mozconfig
65126 export MOZ_NOSPAM=1
66127
@@ -96,9 +157,6 @@ in stdenv.mkDerivation rec {
96157 ac_add_options --enable-official-branding
97158 export MOZILLA_OFFICIAL=1
98159
99− # For versions after 28.12.0
100− ac_add_options --enable-phoenix-extensions
101−
102160 ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}
103161
104162 export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION
@@ -112,24 +170,42 @@ in stdenv.mkDerivation rec {
112170 mk_add_options MOZ_MAKE_FLAGS="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}"
113171 mk_add_options AUTOCONF=${autoconf213}/bin/autoconf
114172 '
173+
174+ runHook postConfigure
115175 '';
116176
117− buildPhase = "./mach build";
177+ buildPhase = ''
178+ runHook preBuild
179+
180+ ./mach build
181+
182+ runHook postBuild
183+ '';
118184
119185 installPhase = ''
186+ runHook preInstall
187+
120188 ./mach install
121189
122190 # Fix missing icon due to wrong WMClass
191+ # TODO report upstream
123192 substituteInPlace ./palemoon/branding/official/palemoon.desktop \
124193 --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
125194 desktop-file-install --dir=$out/share/applications \
126195 ./palemoon/branding/official/palemoon.desktop
127196
197+ # Install official branding icons
128198 for iconname in default{16,22,24,32,48,256} mozicon128; do
129199 n=''${iconname//[^0-9]/}
130200 size=$n"x"$n
131201 install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
132202 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
133209 '';
134210
135211 dontWrapGApps = true;
@@ -154,9 +230,9 @@ in stdenv.mkDerivation rec {
154230 experience, while offering full customization and a growing collection of
155231 extensions and themes to make the browser truly your own.
156232 '';
157− homepage = "https://www.palemoon.org/";
158− license = licenses.mpl20;
233+ homepage = "https://www.palemoon.org/";
234+ license = licenses.mpl20;
159235 maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
160− platforms = [ "i686-linux" "x86_64-linux" ];
236+ platforms = [ "i686-linux" "x86_64-linux" ];
161237 };
162238}
pkgs/top-level/all-packages.nix+1−4
@@ -25232,10 +25232,7 @@ in
2523225232
2523325233 osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { };
2523425234
25235− palemoon = callPackage ../applications/networking/browsers/palemoon {
25236− # https://developer.palemoon.org/build/linux/
25237− stdenv = gcc8Stdenv;
25238− };
25235+ palemoon = callPackage ../applications/networking/browsers/palemoon { };
2523925236
2524025237 webbrowser = callPackage ../applications/networking/browsers/webbrowser {};
2524125238