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
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libpng, static ? false
+{ stdenv, fetchurl, libpng
+, static ? stdenv.hostPlatform.isStatic
 }:

 # This package comes with its own copy of zlib, libpng and pngxtern