From e7e3755d350284d9fd09c173e464ed56b4eed0e7 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 20:41:17 +0400 Subject: [PATCH] rabbitmq-server: migrate to the new macOS SDK --- pkgs/servers/amqp/rabbitmq-server/default.nix | 23 ++++++------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 383ab5af129f..35fb42ed8ec2 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -20,9 +20,6 @@ gnused, systemd, glibcLocales, - AppKit, - Carbon, - Cocoa, nixosTests, which, }: @@ -62,19 +59,13 @@ stdenv.mkDerivation rec { which ]; - buildInputs = - [ - erlang - elixir - libxml2 - libxslt - glibcLocales - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - Cocoa - ]; + buildInputs = [ + erlang + elixir + libxml2 + libxslt + glibcLocales + ]; outputs = [ "out" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba67980dc0d3..4b1626cc964b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12240,7 +12240,6 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { - inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; erlang = erlang_26; };