@@ -2,22 +2,16 @@
22, rustPlatform
33, lib
44, fetchFromGitHub
5−
65, pkg-config
76, fontconfig
87, python3
98, openssl
109, perl
11−
12−# Apple frameworks
13−, CoreGraphics
14−, Cocoa
15−, Foundation
16−
1710, dbus
1811, libX11
1912, xcbutil
2013, libxcb
14+, xcbutilimage
2115, xcbutilkeysyms
2216, xcbutilwm # contains xcb-ewmh among others
2317, libxkbcommon
@@ -28,6 +22,11 @@
2822, libGL
2923, freetype
3024, zlib
25+# Apple frameworks
26+, CoreGraphics
27+, Cocoa
28+, Foundation
29+, libiconv
3130}:
3231let
3332 runtimeDeps = [
@@ -38,6 +37,7 @@ let
3837 libX11
3938 xcbutil
4039 libxcb
40+ xcbutilimage
4141 xcbutilkeysyms
4242 xcbutilwm
4343 libxkbcommon
@@ -47,51 +47,48 @@ let
4747 wayland
4848 libGLU
4949 libGL
50+ openssl
5051 ] ++ lib.optionals (stdenv.isDarwin) [
5152 Foundation
5253 CoreGraphics
5354 Cocoa
55+ libiconv
5456 ];
55− pname = "wezterm";
5657in
5758
58−rustPlatform.buildRustPackage {
59− inherit pname;
60− version = "unstable-2020-11-22";
59+rustPlatform.buildRustPackage rec {
60+ pname = "wezterm";
61+ version = "20210407-nightly";
6162
6263 src = fetchFromGitHub {
6364 owner = "wez";
6465 repo = pname;
65− rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
66− sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
66+ rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
67+ sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
6768 fetchSubmodules = true;
6869 };
69− cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
70+
71+ cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
7072
7173 nativeBuildInputs = [
7274 pkg-config
7375 python3
74− openssl.dev
7576 perl
7677 ];
7778
7879 buildInputs = runtimeDeps;
7980
80− installPhase = "" + lib.optionalString stdenv.isLinux ''
81+ preFixup = lib.optionalString stdenv.isLinux ''
8182 for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
82− patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
83− install -D $releaseDir/$artifact -t $out/bin
83+ patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
8484 done
8585 '' + lib.optionalString stdenv.isDarwin ''
86− mkdir -p "$out/Applications"
87− OUT_APP="$out/Applications/WezTerm.app"
88− cp -r assets/macos/WezTerm.app "$OUT_APP"
89− rm $OUT_APP/*.dylib
90− cp -r assets/shell-integration/* "$OUT_APP"
91− cp $releaseDir/wezterm "$OUT_APP"
92− cp $releaseDir/wezterm-mux-server "$OUT_APP"
93− cp $releaseDir/wezterm-gui "$OUT_APP"
94− cp $releaseDir/strip-ansi-escapes "$OUT_APP"
86+ mkdir -p "$out/Applications"
87+ OUT_APP="$out/Applications/WezTerm.app"
88+ cp -r assets/macos/WezTerm.app "$OUT_APP"
89+ rm $OUT_APP/*.dylib
90+ cp -r assets/shell-integration/* "$OUT_APP"
91+ ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
9592 '';
9693
9794 # prevent further changes to the RPATH
@@ -101,7 +98,7 @@ rustPlatform.buildRustPackage {
10198 description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
10299 homepage = "https://wezfurlong.org/wezterm";
103100 license = licenses.mit;
104− maintainers = with maintainers; [ steveej ];
101+ maintainers = with maintainers; [ steveej SuperSandro2000 ];
105102 platforms = platforms.unix;
106103 };
107104}