treewide: Inline more of the static overlay

Picking up where #107238 left off. I think I'll have gotten all the easy stuff with this.
2021-01-03 21:40:14 +00:00
parent 9c9c6461ba
commit 5c2965145f
17 changed files with 64 additions and 106 deletions
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }:
+{ stdenv, fetchFromGitHub, cmake, fetchpatch
+, staticOnly ? stdenv.hostPlatform.isStatic
+}:

 # ?TODO: there's also python lib in there

--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -2,7 +2,7 @@
 , fixDarwinDylibNames
 , file
 , legacySupport ? false
-, static ? false
+, static ? stdenv.hostPlatform.isStatic
 }:

 stdenv.mkDerivation rec {