From 323827b6bf32f14ba44a9e9ce1f10c5fbdfdf693 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 21 Jan 2025 06:45:56 -0500 Subject: [PATCH 1/2] lune: use new darwin sdk pattern --- pkgs/by-name/lu/lune/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index 698bc92994e2..f7bdc03cf466 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -4,13 +4,8 @@ rustPlatform, fetchFromGitHub, pkg-config, - darwin, cmake, }: - -let - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "lune"; version = "0.8.9"; @@ -30,11 +25,6 @@ rustPlatform.buildRustPackage rec { cmake # required for libz-ng-sys ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml From 878685f103d02e15c1929758cb64e6e2fc0e7fde Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:13:19 -0500 Subject: [PATCH 2/2] lune: fix build on x86_64-darwin --- pkgs/by-name/lu/lune/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index f7bdc03cf466..601d866fffb7 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -54,7 +53,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lune-org/lune/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ lammermann ]; - # note: Undefined symbols for architecture x86_64 - broken = stdenv.hostPlatform.isDarwin; }; }