Merge pull request #301944 from imadnyc/warp-terminal-initial-linux

warp-terminal: enabled wayland support
This commit is contained in:
Emily Trau 2024-04-23 22:01:45 +10:00 committed by GitHub
commit 65f3d712db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -10,9 +10,12 @@
, libglvnd , libglvnd
, libxkbcommon , libxkbcommon
, vulkan-loader , vulkan-loader
, wayland
, xdg-utils , xdg-utils
, xorg , xorg
, zlib , zlib
, makeWrapper
, waylandSupport ? false
}: }:
let let
@ -35,7 +38,7 @@ linux = stdenv.mkDerivation (finalAttrs: {
--replace-fail /opt/ $out/opt/ --replace-fail /opt/ $out/opt/
''; '';
nativeBuildInputs = [ autoPatchelfHook zstd ]; nativeBuildInputs = [ autoPatchelfHook zstd makeWrapper ];
buildInputs = [ buildInputs = [
curl curl
@ -54,7 +57,7 @@ linux = stdenv.mkDerivation (finalAttrs: {
xorg.libxcb xorg.libxcb
xorg.libXcursor xorg.libXcursor
xorg.libXi xorg.libXi
]; ] ++ lib.optionals waylandSupport [wayland];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -62,6 +65,9 @@ linux = stdenv.mkDerivation (finalAttrs: {
mkdir $out mkdir $out
cp -r opt usr/* $out cp -r opt usr/* $out
'' ++ lib.optionalString waylandSupport ''
wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1
'' ++ ''
runHook postInstall runHook postInstall
''; '';
}); });