diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2022-07-31 23:12:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 23:12:20 +0200 |
| commit | 55781585daae421119a9f10a33af03dfd3cc0f42 (patch) | |
| tree | e33b71ef104d54599460ca1d6eb25aa5b273ba29 /pkgs/tools/package-management | |
| parent | 8d665874d28d1558ac5e750a5f0e0c697e05a98b (diff) | |
| parent | b4a0bdcf924ee4ab02954493cfeca44b8edf8b17 (diff) | |
| download | nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar.gz nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar.bz2 nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar.lz nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar.xz nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.tar.zst nixpkgs-55781585daae421119a9f10a33af03dfd3cc0f42.zip | |
Merge pull request #181659 from t184256/rpm-compile-with-cap
rpm: compile --with-cap
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 3deda8d7c5d..dce0b2a9423 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd, fetchpatch +, sqlite, zstd, fetchpatch, libcap }: stdenv.mkDerivation rec { @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] - ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ++ lib.optional stdenv.isLinux libcap; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" - ]; + ] ++ lib.optional stdenv.isLinux "--with-cap"; patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 (fetchpatch { |