From 9a7efb242219af31c1e6cd67278f0238347292f1 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Sun, 24 Jan 2021 10:23:16 -0800 Subject: [PATCH] rpm: add zstd support --- pkgs/tools/package-management/rpm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 18477e987a53..5c72dc071521 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchpatch , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite +, sqlite, zstd }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] + buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--enable-python" "--enable-ndb" "--enable-sqlite" + "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" ];