Skip to content

Commit

Permalink
Merge pull request #268572 from katexochen/rpm/broken-darwin-dependants
Browse files Browse the repository at this point in the history
  • Loading branch information
Artturin authored Nov 24, 2023
2 parents 0bd59c5 + 7e2206c commit 8f45e49
Showing 1 changed file with 30 additions and 6 deletions.
36 changes: 30 additions & 6 deletions pkgs/tools/package-management/rpm/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
{ stdenv, lib
, pkg-config, autoreconfHook, pandoc
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
, sqlite, zstd, libcap
{ stdenv
, lib
, pkg-config
, autoreconfHook
, pandoc
, fetchurl
, cpio
, zlib
, bzip2
, file
, elfutils
, libbfd
, libgcrypt
, libarchive
, nspr
, nss
, popt
, db
, xz
, python
, lua
, llvmPackages
, sqlite
, zstd
, libcap
}:

stdenv.mkDerivation rec {
Expand All @@ -18,8 +39,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ autoreconfHook pkg-config pandoc ];
buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp
++ lib.optional stdenv.isLinux libcap;
++ 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 ]
Expand Down Expand Up @@ -72,5 +93,8 @@ stdenv.mkDerivation rec {
description = "The RPM Package Manager";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux;
# Support for darwin was removed in https://github.com/NixOS/nixpkgs/pull/196350.
# This can be re-enables for apple_sdk.version >= 13.0.
badPlatforms = platforms.darwin;
};
}

0 comments on commit 8f45e49

Please sign in to comment.