diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-13 20:44:43 -0400 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:16 +0000 |
| commit | 41c637e4b3b17f19b6ce705bdb755e8f98eabb0b (patch) | |
| tree | be6af446196d0a10e3770aba8e1b7a13191e774d /nixpkgs/pkgs/applications | |
| parent | 1949213e7997ac860af25d47f846e8b3cb6ecc09 (diff) | |
| download | nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.gz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.bz2 nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.lz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.xz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.zst nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.zip | |
C++ Compilers: Systematize handling of standard libraries
(cherry picked from commit f3f7612a409e4ebbec634ab7f20e094f206d396a)
Diffstat (limited to 'nixpkgs/pkgs/applications')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 624032f98c1e..a8e491177739 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation ({ BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix index bc7e2180850a..707b35dd4995 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c07ad4dad982..7fc69d8e5bd0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${ |