Merge pull request #128121 from sternenseemann/foot-1.8.0

authored by Sandro and committed by GitHub 407151af f7a1f05e

+19 -4
+19 -4
pkgs/applications/terminal-emulators/foot/default.nix
··· 16 16 , tllist 17 17 , wayland-protocols 18 18 , pkg-config 19 + , utf8proc 19 20 , allowPgo ? true 20 21 , python3 # for PGO 21 22 # for clang stdenv check ··· 25 26 }: 26 27 27 28 let 28 - version = "1.7.2"; 29 + version = "1.8.0"; 29 30 30 31 # build stimuli file for PGO build and the script to generate it 31 32 # independently of the foot's build, so we can cache the result ··· 39 40 40 41 src = fetchurl { 41 42 url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; 42 - sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p"; 43 + sha256 = "0w4d0rxi54p8lvbynypcywqqwbbzmyyzc0svjab27ngmdj1034ii"; 43 44 }; 44 45 45 46 dontUnpack = true; ··· 93 94 94 95 src = fetchzip { 95 96 url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; 96 - sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh"; 97 + sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; 97 98 }; 98 99 99 100 nativeBuildInputs = [ ··· 115 116 wayland 116 117 libxkbcommon 117 118 fcft 119 + utf8proc 118 120 ]; 119 121 120 122 # recommended build flags for performance optimized foot builds ··· 129 131 export AR="${ar}" 130 132 ''; 131 133 132 - mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; 134 + mesonFlags = [ 135 + "--buildtype=release" 136 + "-Db_lto=true" 137 + "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" 138 + ]; 133 139 134 140 # build and run binary generating PGO profiles, 135 141 # then reconfigure to build the normal foot binary utilizing PGO ··· 144 150 meson configure -Db_pgo=use 145 151 '' + lib.optionalString (doPgo && compilerName == "clang") '' 146 152 llvm-profdata merge default_*profraw --output=default.profdata 153 + ''; 154 + 155 + outputs = [ "out" "terminfo" ]; 156 + 157 + # make sure nix-env and buildEnv also include the 158 + # terminfo output when the package is installed 159 + postInstall = '' 160 + mkdir -p "$out/nix-support" 161 + echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" 147 162 ''; 148 163 149 164 passthru.tests = {