Skip to content

[pull] main from ghostty-org:main #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Apr 22, 2026
+4 −12
Merged

[pull] main from ghostty-org:main #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38d6451
libghostty-vt: emit resolved include/lib dirs in .pc files
domenkozar Apr 15, 2026
733abbc
libghostty-vt: revert .pc changes and use Nix to fix them
sandydoo Apr 21, 2026
98b7ad4
libghostty-vt: fix broken dynamic linking with pkg-config (#12364)
jcollie Apr 22, 2026
2a3d93f
Update VOUCHED list (#12374)
ghostty-vouch[bot] Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/VOUCHED.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ markhuot
marler8997
marrocco-simone
matkotiric
mattn
micaeljarniac
michielvk
miguelelgallo
Expand Down
15 changes: 3 additions & 12 deletions nix/libghostty-vt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,10 @@ stdenv.mkDerivation (finalAttrs: {

postInstall = ''
mkdir -p "$dev/lib"
mv "$out/lib/libghostty-vt.a" "$dev/lib"
rm "$out/lib/libghostty-vt.so"
mv "$out/include" "$dev"
mv "$out/share" "$dev"

ln -sf "$out/lib/libghostty-vt.so.${lib.versions.major finalAttrs.version}" "$dev/lib/libghostty-vt.so"
mv "$out/lib/libghostty-vt.a" "$dev/lib/"
'';

postFixup = ''
substituteInPlace "$dev/share/pkgconfig/libghostty-vt.pc" \
--replace-fail "$out" "$dev"
substituteInPlace "$dev/share/pkgconfig/libghostty-vt-static.pc" \
--replace-fail "$out" "$dev"
'';
Expand Down Expand Up @@ -128,8 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preBuildHooks

cc -o test test_libghostty_vt.c \
''$(pkg-config --cflags --libs libghostty-vt) \
-Wl,-rpath,"${finalAttrs.finalPackage}/lib"
''$(pkg-config --cflags --libs libghostty-vt)

runHook postBuildHooks
'';
Expand Down Expand Up @@ -207,8 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preBuildHooks

cc -o test main.c \
''$(pkg-config --cflags --libs libghostty-vt) \
-Wl,-rpath,"${finalAttrs.finalPackage}/lib"
''$(pkg-config --cflags --libs libghostty-vt)

runHook postBuildHooks
'';
Expand Down