public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118712 from pinpox/wezterm-01

Browse Source 
wezterm: unstable-2020-11-22 -> 20210407-nightly
This commit is contained in:
Jörg Thalheim 2021-04-13 07:58:30 +01:00 committed by GitHub
commit d065602937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -2,22 +2,16 @@
, rustPlatform , rustPlatform
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, fontconfig , fontconfig
, python3 , python3
, openssl , openssl
, perl , perl
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, 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
@ -28,6 +22,11 @@
, libGL , libGL
, freetype , freetype
, zlib , zlib
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, libiconv
}: }:
let let
runtimeDeps = [ runtimeDeps = [
@ -38,6 +37,7 @@ let
libX11 libX11
xcbutil xcbutil
libxcb libxcb
xcbutilimage
xcbutilkeysyms xcbutilkeysyms
xcbutilwm xcbutilwm
libxkbcommon libxkbcommon
@ -47,40 +47,40 @@ let
wayland wayland
libGLU libGLU
libGL libGL
openssl
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
Foundation Foundation
CoreGraphics CoreGraphics
Cocoa Cocoa
libiconv
]; ];
pname = "wezterm";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage rec {
inherit pname; pname = "wezterm";
version = "unstable-2020-11-22"; version = "20210407-nightly";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wez"; owner = "wez";
repo = pname; repo = pname;
rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda"; rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8"; sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
python3 python3
openssl.dev
perl perl
]; ];
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 +88,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
@ -101,7 +98,7 @@ rustPlatform.buildRustPackage {
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm"; homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ steveej ]; maintainers = with maintainers; [ steveej SuperSandro2000 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }