Merge branch 'master' into staging

2019-04-26 16:35:54 +02:00
parent c890a3dd0f b63c99659e
commit 89a150355b
111 changed files with 3119 additions and 1201 deletions
@@ -15,7 +15,7 @@ stdenv.mkDerivation {

  buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;

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

  doCheck = stdenv.isLinux;
  checkTarget = "tests";