Skip to content

Commit e7b5fa2

Browse files
committed
chore(oxiced): Bundle vk_icd
1 parent 39a99f3 commit e7b5fa2

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
libXi,
2121
libXcursor,
2222
mesa,
23+
makeWrapper,
2324
...
2425
}: let
2526
cargoToml = builtins.fromTOML (builtins.readFile ../oxirun/Cargo.toml);
@@ -71,6 +72,7 @@ in
7172
libGL
7273
libxkbcommon
7374
libclang
75+
makeWrapper
7476
];
7577

7678
copyLibs = true;
@@ -94,6 +96,8 @@ in
9496
];
9597
in ''
9698
patchelf --set-rpath "${libPath}" "$out/bin/oxirun"
99+
wrapProgram "$out/bin/oxirun" \
100+
--set VK_ICD_FILENAMES "${driverIcdPath}/radeon_icd.${icdArch}.json:${driverIcdPath}/intel_icd.${icdArch}.json"
97101
'';
98102

99103
meta = with lib; {

0 commit comments

Comments
 (0)