From 5e90cb8800ef5fb24b3c2fccb4aecfcbc1926cb0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 17:49:01 +0200 Subject: [PATCH] foot: install terminfo to separate output * See also https://codeberg.org/dnkl/foot/pulls/607 * propagated-user-env-packages is undocumented unfortunately, but ensure that if you add foot(.out) to your `systemPackages` or install it via `nix-env`, the terminfo output is also installed automatically. * Resolves #125390. --- .../terminal-emulators/foot/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 6667b309d1b3..f69625e16cd0 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -131,7 +131,11 @@ stdenv.mkDerivation rec { export AR="${ar}" ''; - mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + mesonFlags = [ + "--buildtype=release" + "-Db_lto=true" + "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + ]; # build and run binary generating PGO profiles, # then reconfigure to build the normal foot binary utilizing PGO @@ -148,6 +152,15 @@ stdenv.mkDerivation rec { llvm-profdata merge default_*profraw --output=default.profdata ''; + outputs = [ "out" "terminfo" ]; + + # make sure nix-env and buildEnv also include the + # terminfo output when the package is installed + postInstall = '' + mkdir -p "$out/nix-support" + echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + ''; + passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv;