Merge master into staging-next

2021-05-19 00:55:36 +00:00
parent abbbeaf42a 4e211c1b09
commit 7000ae2b9a
49 changed files with 626 additions and 171 deletions
--- a/pkgs/development/compilers/cc65/default.nix
+++ b/pkgs/development/compilers/cc65/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
    sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
  };

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

  meta = with lib; {
    homepage = "https://cc65.github.io/";