From 718741995339d9814255734e134156ff8e2a66de Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 4 Aug 2024 00:06:00 -0400
Subject: [PATCH] rpm: fix build on Darwin
RPM needs a 13.x SDK or newer.
---
pkgs/tools/package-management/rpm/default.nix | 30 +++++++++++++++----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index ae4352ca0109..c42bcca20c90 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -3,6 +3,7 @@
, pkg-config
, autoreconfHook
, pandoc
+, fetchpatch2
, fetchurl
, cpio
, zlib
@@ -23,6 +24,8 @@
, sqlite
, zstd
, libcap
+, apple-sdk_13
+, darwinMinVersionHook
}:
stdenv.mkDerivation rec {
@@ -34,13 +37,33 @@ stdenv.mkDerivation rec {
hash = "sha256-N/O0LAlmlB4q0/EP3jY5gkplkdBxl7qP0IacoHeeH1Y=";
};
+ patches = [
+ # Resolves `error: expected expression` on clang
+ # See: https://github.com/rpm-software-management/rpm/issues/2435.
+ (fetchpatch2 {
+ url = "https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414.diff?full_index=1";
+ hash = "sha256-0f7YOL2xR07xgAEN32oRbOjPsAsVmKFVtTLXUOeFAa8=";
+ })
+ # Fix missing includes required to build on Darwin.
+ # See: https://github.com/rpm-software-management/rpm/pull/2571.
+ (fetchpatch2 {
+ url = "https://github.com/rpm-software-management/rpm/commit/f07875392a09228b1a25c1763a50bbbd0f6798c2.diff?full_index=1";
+ hash = "sha256-DLpzMApRCgI9zqheglFtqL8E1vq9X/aQa0HMnIAQgk8=";
+ })
+ (fetchpatch2 {
+ url = "https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d.diff?full_index=1";
+ hash = "sha256-q3fIBfiUJVmw6Vi2/Bo/zX6/cqTM7aFnskKfMVK3DlU=";
+ })
+ ];
+
outputs = [ "out" "dev" "man" ];
separateDebugInfo = true;
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.hostPlatform.isLinux libcap;
+ ++ lib.optional stdenv.hostPlatform.isLinux libcap
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 (darwinMinVersionHook "13.0") ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]
@@ -92,9 +115,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ gpl2Plus lgpl21Plus ];
description = "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;
+ platforms = platforms.linux ++ platforms.darwin;
};
}