JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110713 from rb2k/zstd_support_for_rpm

Browse Source 
rpm: add zstd support
This commit is contained in:
Sandro 2021-01-25 01:29:33 +01:00 committed by GitHub
commit f8b6de7301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/package-management/rpm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchpatch { stdenv, lib, fetchpatch
, pkg-config, autoreconfHook , pkg-config, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
, sqlite , sqlite, zstd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ autoreconfHook pkg-config ]; 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 ]; ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements # 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-python"
"--enable-ndb" "--enable-ndb"
"--enable-sqlite" "--enable-sqlite"
"--enable-zstd"
"--localstatedir=/var" "--localstatedir=/var"
"--sharedstatedir=/com" "--sharedstatedir=/com"
]; ];