Merge branch 'master' into staging

A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
parent 2e7cb61cfb 9a56eee0b1
commit 2d6179d1e8
678 changed files with 49966 additions and 51072 deletions
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
-, buildPlatform, hostPlatform
 }:

 with stdenv.lib;
@@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
    })] ++
    # Don't search in non-Nix locations such as /usr, but do search in our libc.
    [ ./search-path-2.8.patch ] ++
-    optional (hostPlatform != buildPlatform) (fetchurl {
+    optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchurl {
      name = "fix-darwin-cross-compile.patch";
      url = "https://public.kitware.com/Bug/file_download.php?"
          + "file_id=4981&type=bug";