From ddc3fd14948e7ab396e93b7057fd0a4ea3c6cf39 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 May 2024 19:52:24 +0800 Subject: [PATCH 1/2] blackbox-terminal: Fix build This uses a vte that still has box_drawing_generate.sh in src. --- .../terminal-emulators/blackbox-terminal/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 5b8e0078d75c..f71a9dce894f 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; }; + postPatch = (old.postPatch or "") + '' + patchShebangs src/box_drawing_generate.sh + ''; } // lib.optionalAttrs sixelSupport { buildInputs = old.buildInputs ++ [ libsixel ]; mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; From 3e65cc1e5728aff3ed569b3fbd7d9a5b7304b07d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 May 2024 20:00:26 +0800 Subject: [PATCH 2/2] vte: add blackbox-terminal to passthru.tests --- pkgs/development/libraries/vte/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d160f7433218..d5194ea29949 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -27,6 +27,7 @@ , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests +, blackbox-terminal }: stdenv.mkDerivation (finalAttrs: { @@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; + blackbox-terminal = blackbox-terminal.override { sixelSupport = true; }; }; };