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
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv";
  };

-  makeFlags = [ "CC=cc" "LD=cc" ];      # gcc and/or clang compat
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];      # gcc and/or clang compat

  configurePhase = ''
    sed -i s,/usr,$out, Makefile