summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2023-06-25 23:43:13 +0200
committerGitHub <noreply@github.com>2023-06-25 23:43:13 +0200
commit59c239670af8b377b5f23556651e8b9892be0f77 (patch)
tree627320230a4324480e08dd63ede21ed8f678161b
parentMerge pull request #239819 from r-ryantm/auto-update/supabase-cli (diff)
downloadnixpkgs-origin/revert-233136-wezterm-darwin-fix.tar.gz
Revert "wezterm: fix darwin build"origin/revert-233136-wezterm-darwin-fix
-rw-r--r--pkgs/applications/terminal-emulators/wezterm/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix
index 9743197d8323..26c35d50d214 100644
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -22,7 +22,6 @@
, CoreGraphics
, Cocoa
, Foundation
-, System
, libiconv
, UserNotifications
, nixosTests
@@ -82,14 +81,11 @@ 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e2b95205ad0..4626960e100c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,7 +2813,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 System;
+ inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications;
};
x3270 = callPackage ../applications/terminal-emulators/x3270 { };