From a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 1 Jul 2020 21:55:06 +0100 Subject: stdenv: make -nostdinc work as intended Right now we add glibc to search path also -nostdinc was provided, which breaks projects providing their own gcc. (cherry picked from commit 96092dc93640b8ad6520a8bae6f78d62eaba0ec2) --- .../pkgs/applications/networking/mailreaders/thunderbird/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix') diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7fc69d8e5bd0..4abedec52318 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -173,7 +173,8 @@ stdenv.mkDerivation rec { # included we need to look in a few places. # TODO: generalize this process for other use-cases. - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ + $(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ -- cgit 1.4.1