From 2e0e2a426bbb39b27e70afcace245f8174768c65 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 14 Mar 2023 15:49:18 -0400 Subject: [PATCH] fclones: fix build on x86_64-darwin --- pkgs/tools/misc/fclones/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 6fecc3365e7..4a22def16c2 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -1,9 +1,8 @@ { lib -, stdenv -, fetchFromGitHub -, libiconv , rustPlatform -, AppKit +, fetchFromGitHub +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -20,8 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-C7DKwEMYdypfItflMOL7rjbAdXDRsXDNoPlc9j6aBRA="; buildInputs = lib.optionals stdenv.isDarwin [ - AppKit - libiconv + darwin.apple_sdk_11_0.frameworks.AppKit ]; # device::test_physical_device_name test fails on Darwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 901039d799a..53ab8af4191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29952,9 +29952,7 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + fclones = callPackage ../tools/misc/fclones { }; fcp = callPackage ../tools/misc/fcp { };