Merge master into staging-next

2020-12-23 12:25:37 +00:00
parent c0412cfe92 b67ba0bfcc
commit bb5bf5cd27
4 changed files with 7 additions and 6 deletions
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -73,7 +73,7 @@ let
  flags = [
    "-nostdinc"
    "-nostdinc++"
-    "-isystem" "${glibc.dev}/include"
+    "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
    "-I" "${unwrapped}/include"
    "-I" "${unwrapped}/lib/clang/5.0.2/include"
  ];