git.iko.soy/typeable/nixpkgs
on master help sign in
thunderbird-68: drop
commitdd9525240f296855514a5e505f2446d1f5ec8a36 authorajs124 <git@ajs124.de> dateSat 15 May 2021, 17:55 (6 years ago) parentb23797e
3 files changed−386
pkgs/applications/networking/mailreaders/thunderbird/68.nix−343 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch−36 pkgs/top-level/all-packages.nix−7
pkgs/applications/networking/mailreaders/thunderbird/68.nixdeleted−343
@@ -1,343 +0,0 @@
1−# This pakcage is keeped until Thunderbird 78 supports OpenPGP.
2−# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/
3−{ autoconf213
4−, bzip2
5−, cargo
6−, common-updater-scripts
7−, copyDesktopItems
8−, coreutils
9−, curl
10−, dbus
11−, dbus-glib
12−, fetchurl
13−, file
14−, fontconfig
15−, freetype
16−, glib
17−, gnugrep
18−, gnused
19−, icu
20−, jemalloc
21−, lib
22−, libGL
23−, libGLU
24−, libevent
25−, libjpeg
26−, libnotify
27−, libpng
28−, libstartup_notification
29−, libvpx
30−, libwebp
31−, llvmPackages
32−, m4
33−, makeDesktopItem
34−, nasm
35−, nodejs
36−, nspr
37−, nss
38−, pango
39−, perl
40−, pkg-config
41−, python2
42−, python3
43−, runtimeShell
44−, rust-cbindgen
45−, rustc
46−, sqlite
47−, stdenv
48−, systemd
49−, unzip
50−, which
51−, writeScript
52−, xidel
53−, xorg
54−, yasm
55−, zip
56−, zlib
57−
58−, debugBuild ? false
59−
60−, alsaSupport ? stdenv.isLinux, alsaLib
61−, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
62−, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
63−, waylandSupport ? true
64−, libxkbcommon, calendarSupport ? true
65−
66−# Use official trademarked branding. Permission obtained at:
67−# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971
68−, enableOfficialBranding ? true
69−}:
70−
71−assert waylandSupport -> gtk3Support == true;
72−
73−stdenv.mkDerivation rec {
74− pname = "thunderbird";
75− version = "68.12.0";
76−
77− src = fetchurl {
78− url =
79− "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
80− sha512 =
81− "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7";
82− };
83−
84− nativeBuildInputs = [
85− autoconf213
86− cargo
87− copyDesktopItems
88− gnused
89− llvmPackages.llvm
90− m4
91− nasm
92− nodejs
93− perl
94− pkg-config
95− python2
96− python3
97− rust-cbindgen
98− rustc
99− which
100− yasm
101− unzip
102− ] ++ lib.optional gtk3Support wrapGAppsHook;
103−
104− buildInputs = [
105− bzip2
106− dbus
107− dbus-glib
108− file
109− fontconfig
110− freetype
111− glib
112− gtk2
113− icu
114− jemalloc
115− libGL
116− libGLU
117− libevent
118− libjpeg
119− libnotify
120− libpng
121− libstartup_notification
122− libvpx
123− libwebp
124− nspr
125− nss
126− pango
127− perl
128− sqlite
129− xorg.libX11
130− xorg.libXScrnSaver
131− xorg.libXcursor
132− xorg.libXext
133− xorg.libXft
134− xorg.libXi
135− xorg.libXrender
136− xorg.libXt
137− xorg.pixman
138− xorg.xorgproto
139− zip
140− zlib
141− ] ++ lib.optional alsaSupport alsaLib
142− ++ lib.optional gtk3Support gtk3
143− ++ lib.optional pulseaudioSupport libpulseaudio
144− ++ lib.optional waylandSupport libxkbcommon;
145−
146− NIX_CFLAGS_COMPILE =[
147− "-I${glib.dev}/include/gio-unix-2.0"
148− "-I${nss.dev}/include/nss"
149− ];
150−
151− patches = [
152− ./no-buildconfig-68.patch
153− ];
154−
155− postPatch = ''
156− rm -rf obj-x86_64-pc-linux-gnu
157− '';
158−
159− hardeningDisable = [ "format" ];
160−
161− preConfigure = ''
162− # remove distributed configuration files
163− rm -f configure
164− rm -f js/src/configure
165− rm -f .mozconfig*
166−
167− configureScript="$(realpath ./mach) configure"
168− # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
169− unset AS
170−
171− export MOZCONFIG=$(pwd)/mozconfig
172−
173− # Set C flags for Rust's bindgen program. Unlike ordinary C
174− # compilation, bindgen does not invoke $CC directly. Instead it
175− # uses LLVM's libclang. To make sure all necessary flags are
176− # included we need to look in a few places.
177− # TODO: generalize this process for other use-cases.
178−
179− BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
180− $(< ${stdenv.cc}/nix-support/cc-cflags) \
181− $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
182− ${
183− lib.optionalString stdenv.cc.isClang
184− "-idirafter ${stdenv.cc.cc}/lib/clang/${
185− lib.getVersion stdenv.cc.cc
186− }/include"
187− } \
188− ${
189− lib.optionalString stdenv.cc.isGNU
190− "-isystem ${stdenv.cc.cc}/include/c++/${
191− lib.getVersion stdenv.cc.cc
192− } -isystem ${stdenv.cc.cc}/include/c++/${
193− lib.getVersion stdenv.cc.cc
194− }/${stdenv.hostPlatform.config}"
195− } \
196− $NIX_CFLAGS_COMPILE"
197−
198− echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
199− '';
200−
201− configureFlags = let
202− toolkitSlug = if gtk3Support then
203− "3${lib.optionalString waylandSupport "-wayland"}"
204− else
205− "2";
206− toolkitValue = "cairo-gtk${toolkitSlug}";
207− in [
208− "--enable-application=comm/mail"
209−
210− "--with-system-bz2"
211− "--with-system-icu"
212− "--with-system-jpeg"
213− "--with-system-libevent"
214− "--with-system-nspr"
215− "--with-system-nss"
216− "--with-system-png" # needs APNG support
217− "--with-system-icu"
218− "--with-system-zlib"
219− "--with-system-webp"
220− "--with-system-libvpx"
221−
222− "--enable-rust-simd"
223− "--enable-crashreporter"
224− "--enable-default-toolkit=${toolkitValue}"
225− "--enable-js-shell"
226− "--enable-necko-wifi"
227− "--enable-startup-notification"
228− "--enable-system-ffi"
229− "--enable-system-pixman"
230− "--enable-system-sqlite"
231−
232− "--disable-gconf"
233− "--disable-tests"
234− "--disable-updater"
235− "--enable-jemalloc"
236− ] ++ (if debugBuild then [
237− "--enable-debug"
238− "--enable-profiling"
239− ] else [
240− "--disable-debug"
241− "--enable-release"
242− "--disable-debug-symbols"
243− "--enable-optimize"
244− "--enable-strip"
245− ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [
246− # on i686-linux: --with-libclang-path is not available in this configuration
247− "--with-libclang-path=${llvmPackages.libclang}/lib"
248− "--with-clang-path=${llvmPackages.clang}/bin/clang"
249− ] ++ lib.optional alsaSupport "--enable-alsa"
250− ++ lib.optional calendarSupport "--enable-calendar"
251− ++ lib.optional enableOfficialBranding "--enable-official-branding"
252− ++ lib.optional pulseaudioSupport "--enable-pulseaudio";
253−
254− enableParallelBuilding = true;
255−
256− postConfigure = ''
257− cd obj-*
258− '';
259−
260− makeFlags = lib.optionals enableOfficialBranding [
261− "MOZILLA_OFFICIAL=1"
262− "BUILD_OFFICIAL=1"
263− ];
264−
265− doCheck = false;
266−
267− desktopItems = [
268− (makeDesktopItem {
269− categories = lib.concatStringsSep ";" [ "Application" "Network" ];
270− desktopName = "Thunderbird";
271− genericName = "Mail Reader";
272− name = "thunderbird";
273− exec = "thunderbird %U";
274− icon = "$out/lib/thunderbird/chrome/icons/default/default256.png";
275− mimeType = lib.concatStringsSep ";" [
276− # Email
277− "x-scheme-handler/mailto"
278− "message/rfc822"
279− # Feeds
280− "x-scheme-handler/feed"
281− "application/rss+xml"
282− "application/x-extension-rss"
283− # Newsgroups
284− "x-scheme-handler/news"
285− "x-scheme-handler/snews"
286− "x-scheme-handler/nntp"
287− ];
288− })
289− ];
290− postInstall = ''
291− # TODO: Move to a dev output?
292− rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
293− '';
294−
295− preFixup = ''
296− # Needed to find Mozilla runtime
297− gappsWrapperArgs+=(
298− --argv0 "$out/bin/thunderbird"
299− --set MOZ_APP_LAUNCHER thunderbird
300− # https://github.com/NixOS/nixpkgs/pull/61980
301− --set SNAP_NAME "thunderbird"
302− --set MOZ_LEGACY_PROFILES 1
303− --set MOZ_ALLOW_DOWNGRADE 1
304− )
305− '';
306−
307− # FIXME: The XUL portion of this can probably be removed as soon as we
308− # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
309− postFixup = ''
310− local xul="$out/lib/thunderbird/libxul.so"
311− patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
312− '';
313−
314− doInstallCheck = true;
315− installCheckPhase = ''
316− "$out/bin/thunderbird" --version
317− '';
318−
319− disallowedRequisites = [
320− stdenv.cc
321− ];
322−
323− passthru.updateScript = import ./../../browsers/firefox/update.nix {
324− attrPath = "thunderbird";
325− baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
326− inherit writeScript lib common-updater-scripts xidel coreutils gnused
327− gnugrep curl runtimeShell;
328− };
329−
330− meta = with lib; {
331− description = "A full-featured e-mail client";
332− homepage = "https://www.thunderbird.net";
333− maintainers = with maintainers; [
334− eelco
335− lovesegfault
336− pierron
337− vcunat
338− ];
339− platforms = platforms.linux;
340− license = licenses.mpl20;
341− knownVulnerabilities = [ "Support ended around Semptember 2020." ];
342− };
343−}
pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patchdeleted−36
@@ -1,36 +0,0 @@
1−Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
2−diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
3−--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
4−+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
5−@@ -32,8 +32,6 @@
6− {"about", "chrome://global/content/aboutAbout.xhtml", 0},
7− {"addons", "chrome://mozapps/content/extensions/extensions.xul",
8− nsIAboutModule::ALLOW_SCRIPT},
9−- {"buildconfig", "chrome://global/content/buildconfig.html",
10−- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
11− {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
12− nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
13− nsIAboutModule::ALLOW_SCRIPT},
14−diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
15−--- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
16−+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
17−@@ -39,7 +39,6 @@
18− content/global/plugins.css
19− content/global/browser-child.js
20− content/global/browser-content.js
21−-* content/global/buildconfig.html
22− content/global/buildconfig.css
23− content/global/contentAreaUtils.js
24− content/global/datepicker.xhtml
25−--- a/comm/mail/base/jar.mn
26−+++ b/comm/mail/base/jar.mn
27−@@ -117,9 +117,7 @@
28− % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
29− % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
30−
31−-* content/messenger/buildconfig.html (content/buildconfig.html)
32− content/messenger/buildconfig.css (content/buildconfig.css)
33−-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
34− % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css
35−
36− # L10n resources and overrides.
pkgs/top-level/all-packages.nix−7
@@ -26486,13 +26486,6 @@ in
2648626486 gtk3Support = true;
2648726487 };
2648826488
26489− thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
26490− inherit (rustPackages) cargo rustc;
26491− libpng = libpng_apng;
26492− nss = nss_3_44;
26493− gtk3Support = true;
26494− };
26495−
2649626489 thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
2649726490
2649826491 thunderbird-bin = thunderbird-bin-78;