From d064fbc2d90d8091a42e28f23a8f29cc0bf818e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 20 Dec 2024 15:35:28 +0100 Subject: [PATCH] wezterm: clean up old Darwin SDK pattern --- .../terminal-emulators/wezterm/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 83700cb41e25b..e00f8ede1e05d 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -20,12 +20,6 @@ xcbutilwm, wayland, zlib, - CoreGraphics, - Cocoa, - Foundation, - System, - libiconv, - UserNotifications, nixosTests, runCommand, vulkan-loader, @@ -104,20 +98,10 @@ rustPlatform.buildRustPackage rec { xcbutilimage xcbutilkeysyms xcbutilwm # contains xcb-ewmh among others - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreGraphics - Foundation - libiconv - System - UserNotifications ]; buildFeatures = [ "distro-defaults" ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System"; - postInstall = '' mkdir -p $out/nix-support echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad5ea0cb82d90..e4f2e6d12b884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1583,9 +1583,7 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System; - }; + wezterm = callPackage ../applications/terminal-emulators/wezterm { }; twine = with python3Packages; toPythonApplication twine;