diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-12 21:50:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 21:50:01 +0200 |
| commit | 2b76ea94f1fffb210571f9f0fe8d919205638347 (patch) | |
| tree | 00e6d6c3b6633f3dcafb57f258fe95799f7c4887 | |
| parent | 50991ba67d792d31e9c87b2c863b7d73458f7fd6 (diff) | |
| parent | 88cf77c50e6548a18e8c05738a30be57929099a6 (diff) | |
Merge pull request #311102 from JohnRTitor/backport-308877-to-release-23.11
[23.11] warp-terminal: 0.2024.04.16.08.02.stable_00 -> 0.2024.05.07.08.02.stable_02
| -rw-r--r-- | pkgs/by-name/wa/warp-terminal/package.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index b91938ed8e96c..5295ac109c80d 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -10,9 +10,12 @@ , libglvnd , libxkbcommon , vulkan-loader +, wayland , xdg-utils , xorg , zlib +, makeWrapper +, waylandSupport ? false }: let @@ -35,7 +38,7 @@ linux = stdenv.mkDerivation (finalAttrs: { --replace /opt/ $out/opt/ ''; - nativeBuildInputs = [ autoPatchelfHook zstd ]; + nativeBuildInputs = [ autoPatchelfHook zstd makeWrapper ]; buildInputs = [ curl @@ -54,7 +57,7 @@ linux = stdenv.mkDerivation (finalAttrs: { xorg.libxcb xorg.libXcursor xorg.libXi - ]; + ] ++ lib.optionals waylandSupport [wayland]; installPhase = '' runHook preInstall @@ -62,6 +65,9 @@ linux = stdenv.mkDerivation (finalAttrs: { mkdir $out cp -r opt usr/* $out + '' + lib.optionalString waylandSupport '' + wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1 + '' + '' runHook postInstall ''; }); @@ -93,7 +99,7 @@ meta = with lib; { homepage = "https://www.warp.dev"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime imadnyc ]; + maintainers = with maintainers; [ emilytrau Enzime imadnyc donteatoreo ]; platforms = platforms.darwin ++ [ "x86_64-linux" ]; }; |