Merge pull request #233136 from mokrinsky/wezterm-darwin-fix

wezterm: fix darwin build
This commit is contained in:
Weijia Wang 2023-05-21 19:04:12 +03:00 committed by GitHub
commit 1dbe7ef7b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -22,6 +22,7 @@
, CoreGraphics
, Cocoa
, Foundation
, System
, libiconv
, UserNotifications
, nixosTests
@ -81,11 +82,14 @@ rustPlatform.buildRustPackage rec {
CoreGraphics
Foundation
libiconv
System
UserNotifications
];
buildFeatures = [ "distro-defaults" ];
env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System";
postInstall = ''
mkdir -p $out/nix-support
echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages

View File

@ -2714,7 +2714,7 @@ with pkgs;
wayst = callPackage ../applications/terminal-emulators/wayst { };
wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System;
};
x3270 = callPackage ../applications/terminal-emulators/x3270 { };