Merge branch 'master' into staging

This apparently fixes some broken src fetches (gnuradio, twisted).
2018-07-02 11:10:26 +02:00
parent f7781f5293 a22ba5f05b
commit c1ffc65d1a
197 changed files with 7027 additions and 2265 deletions
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
    configureFlags = [
        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
        ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
-        "--with-random /dev/urandom"
+        "--with-random=/dev/urandom"
      ];
  };