Merge staging-next into staging

2021-02-20 00:36:40 +00:00
parent f558ed1ea5 848226f810
commit abe7db36a4
93 changed files with 2835 additions and 1177 deletions
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
  preInstall = ''
     mv zic.o zic.o.orig
     mv zic zic.orig
-     make $makeFlags cc=cc AR=ar zic
+     make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic
     mv zic zic-native
     mv zic.o.orig zic.o
     mv zic.orig zic