diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/gifsicle/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 3 |
5 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index f4f0ac41563a3..62873569aae16 100644 --- 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 diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index c26ca507525fb..d805602e0dfd3 100644 --- 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 { diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f846bf1f2001a..f26a41ce14265 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, shared ? true }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo +, shared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "e2fsprogs"; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 007ba0f99720a..72220fab48035 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, xorgproto, libXt, libX11, gifview ? false, static ? false }: +{ stdenv, fetchurl, xorgproto, libXt, libX11 +, gifview ? false +, static ? stdenv.hostPlatform.isStatic +}: with stdenv.lib; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 82245f4cd26da..6f1c202a91cc5 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -7,7 +7,8 @@ , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null +, # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 + gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 ? null , c-aresSupport ? false, c-ares ? null , brotliSupport ? false, brotli ? null }: |