Skip to content

Commit

Permalink
wezterm: clean up old Darwin SDK pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
ofalvai committed Dec 20, 2024
1 parent f252c58 commit d064fbc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
16 changes: 0 additions & 16 deletions pkgs/applications/terminal-emulators/wezterm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
xcbutilwm,
wayland,
zlib,
CoreGraphics,
Cocoa,
Foundation,
System,
libiconv,
UserNotifications,
nixosTests,
runCommand,
vulkan-loader,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit d064fbc

Please sign in to comment.