wezterm: unstable-2020-11-22 -> 20210314

This commit is contained in:
Pablo Ovelleiro Corral 2021-04-07 07:54:45 +02:00 committed by github-actions[bot]
parent ae09772927
commit fd12aef5f6

View file

@ -13,11 +13,13 @@
, CoreGraphics , CoreGraphics
, Cocoa , Cocoa
, Foundation , Foundation
, libiconv
, dbus , dbus
, libX11 , libX11
, xcbutil , xcbutil
, libxcb , libxcb
, xcbutilimage
, xcbutilkeysyms , xcbutilkeysyms
, xcbutilwm # contains xcb-ewmh among others , xcbutilwm # contains xcb-ewmh among others
, libxkbcommon , libxkbcommon
@ -38,6 +40,7 @@ let
libX11 libX11
xcbutil xcbutil
libxcb libxcb
xcbutilimage
xcbutilkeysyms xcbutilkeysyms
xcbutilwm xcbutilwm
libxkbcommon libxkbcommon
@ -51,22 +54,23 @@ let
Foundation Foundation
CoreGraphics CoreGraphics
Cocoa Cocoa
libiconv
]; ];
pname = "wezterm"; pname = "wezterm";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit pname; inherit pname;
version = "unstable-2020-11-22"; version = "20210314";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wez"; owner = "wez";
repo = pname; repo = pname;
rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda"; rev = "20210314-114017-04b7cedd";
sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8"; sha256 = "sha256-EwoJLwOgoXtTEBbf/4pM+pCCG8fGkVruHVYh2HivCd0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx"; cargoSha256 = "sha256-OHbWgnlul9VfbPcMdzbuRJG59+myiukkzmnWohj5v2k=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -77,10 +81,9 @@ rustPlatform.buildRustPackage {
buildInputs = runtimeDeps; buildInputs = runtimeDeps;
installPhase = "" + lib.optionalString stdenv.isLinux '' preFixup = "" + lib.optionalString stdenv.isLinux ''
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
install -D $releaseDir/$artifact -t $out/bin
done done
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications" mkdir -p "$out/Applications"
@ -88,10 +91,7 @@ rustPlatform.buildRustPackage {
cp -r assets/macos/WezTerm.app "$OUT_APP" cp -r assets/macos/WezTerm.app "$OUT_APP"
rm $OUT_APP/*.dylib rm $OUT_APP/*.dylib
cp -r assets/shell-integration/* "$OUT_APP" cp -r assets/shell-integration/* "$OUT_APP"
cp $releaseDir/wezterm "$OUT_APP" ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
cp $releaseDir/wezterm-mux-server "$OUT_APP"
cp $releaseDir/wezterm-gui "$OUT_APP"
cp $releaseDir/strip-ansi-escapes "$OUT_APP"
''; '';
# prevent further changes to the RPATH # prevent further changes to the RPATH