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
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
      --replace "/usr/bin/install" "install"
  '';

-  makeFlags = [ "CC=cc" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

  preInstall = ''
    runHook preInstall