diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index e734a1e91eec..0872a75254fe 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -12,6 +12,7 @@ , sassc , libadwaita , pcre2 +, libsixel , libxml2 , librsvg , libgee @@ -20,6 +21,7 @@ , gtk3 , desktop-file-utils , wrapGAppsHook +, sixelSupport ? false }: let @@ -62,7 +64,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk4 - vte-gtk4 + (vte-gtk4.overrideAttrs (old: { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "vte"; + rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; + hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; + }; + } // lib.optionalAttrs sixelSupport { + buildInputs = old.buildInputs ++ [ libsixel ]; + mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; + })) json-glib marble libadwaita @@ -80,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ chuangzhu linsui ]; platforms = platforms.linux; }; } |