@@ -2,19 +2,11 @@
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−, libiconv
17−
1810, dbus
1911, libX11
2012, xcbutil
@@ -30,6 +22,11 @@
3022, libGL
3123, freetype
3224, zlib
25+# Apple frameworks
26+, CoreGraphics
27+, Cocoa
28+, Foundation
29+, libiconv
3330}:
3431let
3532 runtimeDeps = [
@@ -50,38 +47,38 @@ let
5047 wayland
5148 libGLU
5249 libGL
50+ openssl
5351 ] ++ lib.optionals (stdenv.isDarwin) [
5452 Foundation
5553 CoreGraphics
5654 Cocoa
5755 libiconv
5856 ];
59− pname = "wezterm";
6057in
6158
62−rustPlatform.buildRustPackage {
63− inherit pname;
64− version = "20210314";
59+rustPlatform.buildRustPackage rec {
60+ pname = "wezterm";
61+ version = "20210407-nightly";
6562
6663 src = fetchFromGitHub {
6764 owner = "wez";
6865 repo = pname;
69− rev = "20210314-114017-04b7cedd";
70− sha256 = "sha256-EwoJLwOgoXtTEBbf/4pM+pCCG8fGkVruHVYh2HivCd0=";
66+ rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
67+ sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
7168 fetchSubmodules = true;
7269 };
73− cargoSha256 = "sha256-OHbWgnlul9VfbPcMdzbuRJG59+myiukkzmnWohj5v2k=";
70+
71+ cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
7472
7573 nativeBuildInputs = [
7674 pkg-config
7775 python3
78− openssl.dev
7976 perl
8077 ];
8178
8279 buildInputs = runtimeDeps;
8380
84− preFixup = "" + lib.optionalString stdenv.isLinux ''
81+ preFixup = lib.optionalString stdenv.isLinux ''
8582 for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
8683 patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
8784 done
@@ -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}