Merge staging-next into staging

2021-01-04 00:57:38 +00:00
parent c40e1d8c95 2554c5008c
commit 581059aed4
92 changed files with 518 additions and 502 deletions
@@ -6,7 +6,7 @@
 , zlib ? null
 , szip ? null
 , mpi ? null
-, enableShared ? true
+, enableShared ? !stdenv.hostPlatform.isStatic
 }:

 # cpp and mpi options are mutually exclusive
@@ -11,7 +11,7 @@
 , python3
 , util-linux
 , check
-, enableStatic ? false
+, enableStatic ? stdenv.hostPlatform.isStatic
 }:

 stdenv.mkDerivation rec {
@@ -1,7 +1,7 @@
 {
  stdenv, lib, fetchFromGitHub, which,
  buildPackages,
-  enableStatic ? false,
+  enableStatic ? stdenv.hostPlatform.isStatic,
  enableMinimal ? false,
  extraConfig ? ""
 }: