diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-04 00:57:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 00:57:38 +0000 |
| commit | 581059aed4a202bf50b5f27b06234151d8653e14 (patch) | |
| tree | b6be55f925a711140368f608255ae4c70d7b28c1 /pkgs/tools/compression | |
| parent | c40e1d8c9500ed56180aa0cdb153783b444ac8e0 (diff) | |
| parent | 2554c5008c544686f098bd97a53c5cca2a19267c (diff) | |
| download | nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar.gz nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar.bz2 nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar.lz nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar.xz nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.tar.zst nixpkgs-581059aed4a202bf50b5f27b06234151d8653e14.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3e20258cbbe..96d560145df 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, linkStatic ? (stdenv.hostPlatform.system == "i686-cygwin") +, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin , autoreconfHook }: diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 0124a0b3d63..7fceb3854eb 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, valgrind, fetchpatch -, enableStatic ? false, enableShared ? true +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 0b6082bb578..161619a0483 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, enableStatic ? false }: +{ stdenv, fetchurl +, enableStatic ? stdenv.hostPlatform.isStatic +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or |