Merge remote-tracking branch 'origin/master' into flakes

2020-06-26 08:46:46 +02:00
parent 09fc06daab b7ccf7ae2a
commit adf2fbbdc2
66 changed files with 751 additions and 359 deletions
@@ -4,7 +4,7 @@
 #include "nixexpr.hh"
 #include "profiles.hh"

-extern char * * environ;
+extern char * * environ __attribute__((weak));

 namespace nix {