git.iko.soy/typeable/nixpkgs
on master help sign in
thunderbird, thunderbird.bin: Refactor: Reorder import lists.

Also `pkgs.lib` -> `lib`.

commit443724873fc5fb60ee28481d8b341a718799601e authorNiklas Hambüchen <mail@nh2.me> dateTue 22 Dec 2020, 02:02 (6 years ago) parente72bd9f
2 files changed+25−24
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+22−21 pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+22−21
@@ -1,22 +1,31 @@
1−{ stdenv, fetchurl, config, makeWrapper
1+{ stdenv, lib, fetchurl, config, makeWrapper
22, alsaLib
33, at-spi2-atk
44, atk
55, cairo
6+, coreutils
67, cups
78, curl
8−, dbus-glib
99, dbus
10+, dbus-glib
1011, fontconfig
1112, freetype
1213, gdk-pixbuf
1314, glib
1415, glibc
16+, gnome3
17+, gnugrep
18+, gnupg
19+, gnused
20+, gpgme
1521, gtk2
1622, gtk3
1723, kerberos
24+, libcanberra
25+, libGL
26+, libGLU
1827, libX11
19−, libXScrnSaver
28+, libxcb
2029, libXcomposite
2130, libXcursor
2231, libXdamage
@@ -25,22 +34,14 @@
2534, libXi
2635, libXinerama
2736, libXrender
37+, libXScrnSaver
2838, libXt
29−, libxcb
30−, libcanberra
31−, gnome3
32−, libGLU, libGL
3339, nspr
3440, nss
3541, pango
42+, runtimeShell
3643, writeScript
3744, xidel
38−, coreutils
39−, gnused
40−, gnugrep
41−, gnupg
42−, gpgme
43−, runtimeShell
4445}:
4546
4647# imports `version` and `sources`
@@ -59,9 +60,9 @@ let
5960
6061 systemLocale = config.i18n.defaultLocale or "en-US";
6162
62− defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
63+ defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
6364
64− source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
65+ source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
6566
6667 name = "thunderbird-bin-${version}";
6768in
@@ -76,7 +77,7 @@ stdenv.mkDerivation {
7677
7778 phases = "unpackPhase installPhase";
7879
79− libPath = stdenv.lib.makeLibraryPath
80+ libPath = lib.makeLibraryPath
8081 [ stdenv.cc.cc
8182 alsaLib
8283 at-spi2-atk
@@ -111,7 +112,7 @@ stdenv.mkDerivation {
111112 nspr
112113 nss
113114 pango
114− ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
115+ ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
115116 stdenv.cc.cc
116117 ];
117118
@@ -163,8 +164,8 @@ stdenv.mkDerivation {
163164 --set SNAP_NAME "thunderbird" \
164165 --set MOZ_LEGACY_PROFILES 1 \
165166 --set MOZ_ALLOW_DOWNGRADE 1 \
166− --prefix PATH : "${stdenv.lib.getBin gnupg}/bin" \
167− --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib gpgme}/lib"
167+ --prefix PATH : "${lib.getBin gnupg}/bin" \
168+ --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
168169 '';
169170
170171 passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
@@ -174,14 +175,14 @@ stdenv.mkDerivation {
174175 basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
175176 baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
176177 };
177− meta = with stdenv.lib; {
178+ meta = with lib; {
178179 description = "Mozilla Thunderbird, a full-featured email client (binary package)";
179180 homepage = "http://www.mozilla.org/thunderbird/";
180181 license = {
181182 free = false;
182183 url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";
183184 };
184− maintainers = with stdenv.lib.maintainers; [ ];
185+ maintainers = with lib.maintainers; [ ];
185186 platforms = platforms.linux;
186187 };
187188}
pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3
@@ -14,15 +14,15 @@
1414, freetype
1515, glib
1616, gnugrep
17−, gnused
1817, gnupg
18+, gnused
1919, gpgme
2020, icu
2121, jemalloc
2222, lib
23+, libevent
2324, libGL
2425, libGLU
25−, libevent
2626, libjpeg
2727, libnotify
2828, libpng
@@ -338,7 +338,7 @@ stdenv.mkDerivation rec {
338338
339339 requiredSystemFeatures = [ "big-parallel" ];
340340
341− meta = with stdenv.lib; {
341+ meta = with lib; {
342342 description = "A full-featured e-mail client";
343343 homepage = "https://www.thunderbird.net";
344344 maintainers = with maintainers; [