Merge branch 'master' into staging-next

2018-08-31 17:32:48 +02:00
parent a9780a095b dde959a896
commit 93550cbddf
497 changed files with 2235 additions and 1360 deletions
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -67,15 +67,15 @@ in

 let
  config =
-    configs.${stdenv.system}
-    or (throw "unsupported system: ${stdenv.system}");
+    configs.${stdenv.hostPlatform.system}
+    or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 in

 let
  blas64 =
    if blas64_ != null
      then blas64_
-      else hasPrefix "x86_64" stdenv.system;
+      else hasPrefix "x86_64" stdenv.hostPlatform.system;
 in
 stdenv.mkDerivation rec {
  name = "openblas-${version}";