about summary refs log tree commit diff
path: root/nixpkgs/pkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-11-17 20:44:12 +0000
committerAlyssa Ross <hi@alyssa.is>2020-12-04 16:59:16 +0000
commit72aa9b7a75d7286762831d64bd3fbc029e64b554 (patch)
tree2850181ee2d6000aefaac7eecd401b1fd6192738 /nixpkgs/pkgs
parent164de1888076cb0b79555d488b18a4bc82aac7b4 (diff)
downloadnixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar.gz
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar.bz2
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar.lz
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar.xz
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.tar.zst
nixlib-72aa9b7a75d7286762831d64bd3fbc029e64b554.zip
thunderbird: fix build with clang > 7
--with-clang-path is unsupported when doing the whole build with
Clang.  I don't understand why this isn't a problem with clang 7.
Maybe it's too old for whatever uses --with-clang-path?
Diffstat (limited to 'nixpkgs/pkgs')
-rw-r--r--nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 4abedec52318..99fbdd48edf1 100644
--- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -238,6 +238,7 @@ stdenv.mkDerivation rec {
   ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [
     # on i686-linux: --with-libclang-path is not available in this configuration
     "--with-libclang-path=${llvmPackages.libclang}/lib"
+  ] ++ lib.optionals (!stdenv.hostPlatform.isi686 && !stdenv.cc.isClang) [
     "--with-clang-path=${llvmPackages.clang}/bin/clang"
   ] ++ lib.optional alsaSupport "--enable-alsa"
   ++ lib.optional calendarSupport "--enable-calendar"