diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-07-01 21:55:06 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:32 +0000 |
| commit | a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58 (patch) | |
| tree | fd595a79aef4e2890cb85349e510d83c8d9b37ed /nixpkgs/pkgs/applications/networking | |
| parent | 9813779f5440de04f3074b388c02334faaeb0b94 (diff) | |
| download | nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.gz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.bz2 nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.lz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.xz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.zst nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.zip | |
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)
Diffstat (limited to 'nixpkgs/pkgs/applications/networking')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 3 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index a8e491177739..790926ad8a96 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -192,7 +192,8 @@ stdenv.mkDerivation ({ # 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) \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ 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) \ ${ |