Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
parent f7a112f6c4 6bebadb171
commit ca46ad3762
21 changed files with 264 additions and 238 deletions
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv";
  };

+  makeFlags = [ "CPP=${stdenv.cc.targetPrefix}c++" ];
+
  installPhase = ''
    mkdir -p $out/bin
    cp samblaster $out/bin