libghostty-vt: revert .pc changes and use Nix to fix them

Keeps the .pc files templated and instead uses Nix to rewrite the libdir for the static library.
This commit is contained in:
Sander
2026-04-21 22:54:53 +02:00
parent 38d6451d73
commit 733abbcc39
2 changed files with 5 additions and 17 deletions

View File

@@ -59,9 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
"-Dapp-runtime=none"
"-Demit-lib-vt=true"
"-Dsimd=${lib.boolToString simd}"
# Install headers directly into the `dev` output
"--prefix-include-dir"
"${placeholder "dev"}/include"
];
zigCheckFlags = finalAttrs.zigBuildFlags ++ ["test-lib-vt"];

View File

@@ -371,8 +371,8 @@ fn pkgConfigFiles(
return .{
.shared = wf.add("libghostty-vt.pc", b.fmt(
\\prefix={s}
\\includedir={s}
\\libdir={s}
\\includedir=${{prefix}}/include
\\libdir=${{prefix}}/lib
\\
\\Name: libghostty-vt
\\URL: https://github.com/ghostty-org/ghostty
@@ -382,18 +382,11 @@ fn pkgConfigFiles(
\\Libs: -L${{libdir}} -lghostty-vt
\\Libs.private: {s}
\\Requires.private: {s}
, .{
b.install_prefix,
b.h_dir,
b.lib_dir,
zig.version,
libs_private,
requires_private,
})),
, .{ b.install_prefix, zig.version, libs_private, requires_private })),
.static = wf.add("libghostty-vt-static.pc", b.fmt(
\\prefix={s}
\\includedir={s}
\\libdir={s}
\\includedir=${{prefix}}/include
\\libdir=${{prefix}}/lib
\\
\\Name: libghostty-vt-static
\\URL: https://github.com/ghostty-org/ghostty
@@ -405,8 +398,6 @@ fn pkgConfigFiles(
\\Requires.private: {s}
, .{
b.install_prefix,
b.h_dir,
b.lib_dir,
zig.version,
staticLibraryName(os_tag),
libs_private,