cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #309253 from bobby285271/fix/blackbox

Browse source 
blackbox-terminal: Fix build
This commit is contained in:
Bobby Rong 2024-05-05 20:42:06 +08:00 committed by GitHub
commit 9a48f4b86b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
View file

@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; rev = "3c8f66be867aca6656e4109ce880b6ea7431b895";
hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU=";
}; };
postPatch = (old.postPatch or "") + ''
patchShebangs src/box_drawing_generate.sh
'';
} // lib.optionalAttrs sixelSupport { } // lib.optionalAttrs sixelSupport {
buildInputs = old.buildInputs ++ [ libsixel ]; buildInputs = old.buildInputs ++ [ libsixel ];
mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ];

2
pkgs/development/libraries/vte/default.nix
View file

@ -27,6 +27,7 @@
, systemd , systemd
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
, nixosTests , nixosTests
, blackbox-terminal
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
}; };
tests = { tests = {
inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal;
blackbox-terminal = blackbox-terminal.override { sixelSupport = true; };
}; };
}; };