From 509a3cb0ad5c42bc9eb15b7bc2f8c1ccd478d916 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Mon, 11 Jul 2022 00:50:13 +0200 Subject: [PATCH] libsolv: enable more compression methods Without them microdnf segfaults on any real-world usage attempts, since real-world repodata is compressed and error handling is lacking. --- pkgs/development/libraries/libsolv/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 3dde70385358..67797100aa9a 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config +, zlib, lzma, bzip2, zchunk, zstd +, expat, rpm, db }: stdenv.mkDerivation rec { version = "0.7.22"; @@ -17,10 +19,15 @@ stdenv.mkDerivation rec { "-DENABLE_RPMDB=true" "-DENABLE_PUBKEY=true" "-DENABLE_RPMDB_BYRPMHEADER=true" + "-DENABLE_LZMA_COMPRESSION=true" + "-DENABLE_BZIP2_COMPRESSION=true" + "-DENABLE_ZSTD_COMPRESSION=true" + "-DENABLE_ZCHUNK_COMPRESSION=true" + "-DWITH_SYSTEM_ZCHUNK=true" ]; - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ zlib expat rpm db ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ]; meta = with lib; { description = "A free package dependency solver";