diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-04-14 17:00:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-14 17:00:04 +0000 |
| commit | 1db80ad077dc60ac738c012c4941e6ac2a5e749d (patch) | |
| tree | 8f1bab74b6794e78d211232090c3444411c2d243 | |
| parent | scallion: init at 2.1 (#38817) (diff) | |
| download | nixpkgs-origin/yegortimoshenko-patch-2.tar.gz | |
thunderbird: pass less non-standard flagsorigin/yegortimoshenko-patch-2
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1bf37edf1af9..e555fc7d0b74 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -52,40 +52,33 @@ in stdenv.mkDerivation rec { # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; - configureFlags = - [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) - "--enable-application=mail" - "--disable-alsa" - "--disable-pulseaudio" - - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-png" # needs APNG support - "--with-system-icu" - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - #"--enable-system-cairo" - "--enable-startup-notification" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-updater" - "--enable-jemalloc" - "--disable-gconf" - "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" - ] - ++ lib.optional enableCalendar "--enable-calendar" - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--disable-debug-symbols" - "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + configureFlags = [ + "--enable-application=mail" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-png" # needs APNG support + "--with-system-icu" + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + # "--enable-system-cairo" + "--enable-startup-notification" + "--disable-crashreporter" + "--disable-updater" + "--enable-jemalloc" + "--disable-gconf" + "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + ] ++ lib.optional enableCalendar "--enable-calendar" + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--disable-debug-symbols" + "--enable-optimize" "--enable-strip" ]) + ++ lib.optional enableOfficialBranding "--enable-official-branding"; enableParallelBuilding = true; |