diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-12-15 11:57:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 11:57:25 +0100 |
| commit | 9b16d32fe307bc5c92fd21d723208435dcbae68d (patch) | |
| tree | 22c5748fb8d793306ffcdbb0c610addb46a7d76b | |
| parent | Merge pull request #150820 from fabaff/lmp (diff) | |
| download | nixpkgs-origin/revert-118386-p/linux-zstd-i686.tar.gz | |
Revert "linux: don't compress by ZSTD on 32-bit"origin/revert-118386-p/linux-zstd-i686
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9ddb4ef38001..d784d1b66273 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -691,14 +691,7 @@ let DEBUG_MEMORY_INIT = option yes; }); - misc = let - # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz. - # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375 - useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9"; - in { - KERNEL_XZ = mkIf (!useZstd) yes; - KERNEL_ZSTD = mkIf useZstd yes; - + misc = { HID_BATTERY_STRENGTH = yes; # enabled by default in x86_64 but not arm64, so we do that here HIDRAW = yes; @@ -714,6 +707,10 @@ let MODULE_COMPRESS = whenOlder "5.13" yes; MODULE_COMPRESS_XZ = yes; + # use zstd for kernel compression if newer than 5.9, else xz. + KERNEL_XZ = whenOlder "5.9" yes; + KERNEL_ZSTD = whenAtLeast "5.9" yes; + SYSVIPC = yes; # System-V IPC AIO = yes; # POSIX asynchronous I/O |