diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-25 01:29:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 01:29:33 +0100 |
| commit | f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a (patch) | |
| tree | c2137160d5c7ffaa7478fc9153827f0fb9613aff /pkgs/tools | |
| parent | 0c921dbb2d9f8460414647d28b3ef61488881425 (diff) | |
| parent | 9a7efb242219af31c1e6cd67278f0238347292f1 (diff) | |
| download | nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar.gz nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar.bz2 nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar.lz nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar.xz nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.tar.zst nixlib-f8b6de73017268b4929c3ff3b3d9cbaa84ed4f1a.zip | |
Merge pull request #110713 from rb2k/zstd_support_for_rpm
rpm: add zstd support
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 5 |
1 files 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" ]; |