git.iko.soy/typeable/nixpkgs
on master help sign in
wezterm: unstable-2020-11-22 -> 20210314
commitfd12aef5f6498a623a045df73a73e0b3c4528c22 authorPablo Ovelleiro Corral <github@pablo.tools> dateWed 7 Apr 2021, 07:54 (6 years ago) parentae09772
1 file changed+16−16
pkgs/applications/terminal-emulators/wezterm/default.nix+16−16
pkgs/applications/terminal-emulators/wezterm/default.nix+16−16
@@ -13,11 +13,13 @@
1313, CoreGraphics
1414, Cocoa
1515, Foundation
16+, libiconv
1617
1718, dbus
1819, libX11
1920, xcbutil
2021, libxcb
22+, xcbutilimage
2123, xcbutilkeysyms
2224, xcbutilwm # contains xcb-ewmh among others
2325, libxkbcommon
@@ -38,6 +40,7 @@ let
3840 libX11
3941 xcbutil
4042 libxcb
43+ xcbutilimage
4144 xcbutilkeysyms
4245 xcbutilwm
4346 libxkbcommon
@@ -51,22 +54,23 @@ let
5154 Foundation
5255 CoreGraphics
5356 Cocoa
57+ libiconv
5458 ];
5559 pname = "wezterm";
5660in
5761
5862rustPlatform.buildRustPackage {
5963 inherit pname;
60− version = "unstable-2020-11-22";
64+ version = "20210314";
6165
6266 src = fetchFromGitHub {
6367 owner = "wez";
6468 repo = pname;
65− rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
66− sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
69+ rev = "20210314-114017-04b7cedd";
70+ sha256 = "sha256-EwoJLwOgoXtTEBbf/4pM+pCCG8fGkVruHVYh2HivCd0=";
6771 fetchSubmodules = true;
6872 };
69− cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
73+ cargoSha256 = "sha256-OHbWgnlul9VfbPcMdzbuRJG59+myiukkzmnWohj5v2k=";
7074
7175 nativeBuildInputs = [
7276 pkg-config
@@ -77,21 +81,17 @@ rustPlatform.buildRustPackage {
7781
7882 buildInputs = runtimeDeps;
7983
80− installPhase = "" + lib.optionalString stdenv.isLinux ''
84+ preFixup = "" + lib.optionalString stdenv.isLinux ''
8185 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
86+ patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
8487 done
8588 '' + 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"
89+ mkdir -p "$out/Applications"
90+ OUT_APP="$out/Applications/WezTerm.app"
91+ cp -r assets/macos/WezTerm.app "$OUT_APP"
92+ rm $OUT_APP/*.dylib
93+ cp -r assets/shell-integration/* "$OUT_APP"
94+ ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
9595 '';
9696
9797 # prevent further changes to the RPATH