diff options
| -rw-r--r-- | pkgs/applications/terminal-emulators/foot/default.nix | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index ec75454514c4d..f9fea74c113d9 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.9.0"; + version = "1.9.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "0mkzq5lbgl5qp5nj8sk5gyg9hrrklmbjdqzlcr2a6rlmilkxlhwm"; + sha256 = "15h01ijx87i60bdgjjap1ymwlxggsxc6iziykh3bahj8432s1836"; }; depsBuildBuild = [ @@ -144,16 +144,15 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; + # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options mesonFlags = [ + # Use lto "-Db_lto=true" - # Prevent foot from installing its terminfo file into a custom location, - # we need to do this manually in postInstall. - # See https://codeberg.org/dnkl/foot/pulls/673, - # https://codeberg.org/dnkl/foot/src/tag/1.9.0/INSTALL.md#options - "-Dterminfo=disabled" + # “Build” and install terminfo db + "-Dterminfo=enabled" # Ensure TERM=foot is used "-Ddefault-terminfo=foot" - # Tell foot what to set TERMINFO to + # Tell foot to set TERMINFO and where to install the terminfo files "-Dcustom-terminfo-install-location=${terminfoDir}" ]; @@ -174,13 +173,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - postInstall = '' - # build and install foot's terminfo to the standard location - # instead of its custom location - mkdir -p "${terminfoDir}" - tic -o "${terminfoDir}" -x -e foot,foot-direct "$NIX_BUILD_TOP/$sourceRoot/foot.info" - ''; - passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv; |