diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index ad9487b082c8..9f6cba1d55f1 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation { # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build CFLAGS = if !doPgo - then "-O3 -fno-plt" + then "-O3" else pgoCflags; # ar with gcc plugins for lto objects @@ -165,10 +165,10 @@ stdenv.mkDerivation { meson configure -Db_pgo=generate ninja # make sure there is _some_ profiling data on all binaries + meson test ./footclient --version ./foot --version ./utils/xtgettcap - ./tests/test-config # generate pgo data of wayland independent code ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} meson configure -Db_pgo=use @@ -182,6 +182,10 @@ stdenv.mkDerivation { moveToOutput share/foot/themes "$themes" ''; + doCheck = true; + + strictDeps = true; + outputs = [ "out" "terminfo" "themes" ]; passthru.tests = { @@ -208,19 +212,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = [ maintainers.sternenseemann maintainers.abbe ]; platforms = platforms.linux; - # From (presumably) ncurses version 6.3, it will ship a foot - # terminfo file. This however won't include some non-standard - # capabilities foot's bundled terminfo file contains. Unless we - # want to have some features in e. g. vim or tmux stop working, - # we need to make sure that the foot terminfo overwrites ncurses' - # one. Due to <nixpkgs/nixos/modules/config/system-path.nix> - # ncurses is always added to environment.systemPackages on - # NixOS with its priority increased by 3, so we need to go - # one bigger. - # This doesn't matter a lot for local use since foot sets - # TERMINFO to a store path, but allows installing foot.terminfo - # on remote systems for proper foot terminfo support. - priority = (ncurses.meta.priority or 5) + 3 + 1; mainProgram = "foot"; }; } |