84d4f874c2
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev 78e9caf153f5a339bf1d4c000ff6f0a503a369c8
result/bin/apply-formatting $NIXPKGS_PATH
122 lines
2.9 KiB
Nix
122 lines
2.9 KiB
Nix
{
|
|
lib,
|
|
stdenv,
|
|
fetchFromGitLab,
|
|
fetchpatch,
|
|
meson,
|
|
ninja,
|
|
pkg-config,
|
|
vala,
|
|
gtk4,
|
|
vte-gtk4,
|
|
json-glib,
|
|
sassc,
|
|
libadwaita,
|
|
pcre2,
|
|
libsixel,
|
|
libxml2,
|
|
librsvg,
|
|
libgee,
|
|
callPackage,
|
|
python3,
|
|
desktop-file-utils,
|
|
wrapGAppsHook4,
|
|
sixelSupport ? false,
|
|
}:
|
|
|
|
let
|
|
marble = callPackage ./marble.nix { };
|
|
in
|
|
stdenv.mkDerivation rec {
|
|
pname = "blackbox";
|
|
version = "0.14.0";
|
|
|
|
src = fetchFromGitLab {
|
|
domain = "gitlab.gnome.org";
|
|
owner = "raggesilver";
|
|
repo = "blackbox";
|
|
rev = "v${version}";
|
|
hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw=";
|
|
};
|
|
|
|
patches = [
|
|
# Fix closing confirmation dialogs not showing
|
|
(fetchpatch {
|
|
url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch";
|
|
hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A=";
|
|
})
|
|
|
|
# Fix build with GCC 14
|
|
# https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369#note_1986032
|
|
# https://gitlab.gnome.org/raggesilver/blackbox/-/merge_requests/143
|
|
(fetchpatch {
|
|
url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/2f45717f1c18f710d9b9fbf21830027c8f0794e7.patch";
|
|
hash = "sha256-VlXttqOTbhD6Rp7ZODgsafOjeY+Lb5sZP277bC9ENXU=";
|
|
})
|
|
];
|
|
|
|
postPatch = ''
|
|
substituteInPlace build-aux/meson/postinstall.py \
|
|
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
|
patchShebangs build-aux/meson/postinstall.py
|
|
'';
|
|
|
|
nativeBuildInputs = [
|
|
meson
|
|
ninja
|
|
pkg-config
|
|
vala
|
|
sassc
|
|
wrapGAppsHook4
|
|
python3
|
|
desktop-file-utils # For update-desktop-database
|
|
];
|
|
buildInputs = [
|
|
gtk4
|
|
(vte-gtk4.overrideAttrs (
|
|
old:
|
|
{
|
|
src = fetchFromGitLab {
|
|
domain = "gitlab.gnome.org";
|
|
owner = "GNOME";
|
|
repo = "vte";
|
|
rev = "3c8f66be867aca6656e4109ce880b6ea7431b895";
|
|
hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU=";
|
|
};
|
|
patches = lib.optional (old ? patches) (lib.head old.patches);
|
|
postPatch =
|
|
(old.postPatch or "")
|
|
+ ''
|
|
patchShebangs src/box_drawing_generate.sh
|
|
'';
|
|
}
|
|
// lib.optionalAttrs sixelSupport {
|
|
buildInputs = old.buildInputs ++ [ libsixel ];
|
|
mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ];
|
|
}
|
|
))
|
|
json-glib
|
|
marble
|
|
libadwaita
|
|
pcre2
|
|
libxml2
|
|
librsvg
|
|
libgee
|
|
];
|
|
|
|
mesonFlags = [ "-Dblackbox_is_flatpak=false" ];
|
|
|
|
meta = with lib; {
|
|
description = "Beautiful GTK 4 terminal";
|
|
mainProgram = "blackbox";
|
|
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
|
|
linsui
|
|
];
|
|
platforms = platforms.linux;
|
|
};
|
|
}
|