fix(nix): wrap executable to include correct XKB_CONFIG_ROOT variable
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
, stdenv
|
, stdenv
|
||||||
, lib
|
, lib
|
||||||
, openxr-loader
|
, openxr-loader
|
||||||
|
, makeWrapper
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
@@ -78,7 +79,8 @@ rustPlatform.buildRustPackage rec {
|
|||||||
--set-rpath "${libPath}" \
|
--set-rpath "${libPath}" \
|
||||||
$sk/sk_gpu/tools/linux_x64/skshaderc
|
$sk/sk_gpu/tools/linux_x64/skshaderc
|
||||||
'';
|
'';
|
||||||
nativeBuildInputs = [ cmake pkg-config llvmPackages.libcxxClang ];
|
|
||||||
|
nativeBuildInputs = [ cmake pkg-config llvmPackages.libcxxClang makeWrapper ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libGL
|
libGL
|
||||||
mesa
|
mesa
|
||||||
@@ -94,4 +96,9 @@ rustPlatform.buildRustPackage rec {
|
|||||||
libgbm
|
libgbm
|
||||||
];
|
];
|
||||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram $out/bin/stardust-xr-server \
|
||||||
|
--set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user