diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-06 11:19:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-06 11:38:24 +0200 |
| commit | bb320adc886daaf6ec99a6ee2e009ea621d92e2c (patch) | |
| tree | 8bf5dd1895cb18d5c4f23e2f193a28714aad9510 /pkgs/development/libraries/mesa | |
| parent | aae463d3dd0912fb7697147e4ec15e10efe638b4 (diff) | |
| parent | 19be5ac0119740b050ddcfd8608691ebf65abf9e (diff) | |
| download | nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar.gz nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar.bz2 nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar.lz nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar.xz nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.tar.zst nixpkgs-bb320adc886daaf6ec99a6ee2e009ea621d92e2c.zip | |
Merge #224857: mesa: fix zink by patching RPATH so it finds libvulkan.so
...into staging-next
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/generic.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mesa/generic.nix b/pkgs/development/libraries/mesa/generic.nix index f7463c78451..82055ecd342 100644 --- a/pkgs/development/libraries/mesa/generic.nix +++ b/pkgs/development/libraries/mesa/generic.nix @@ -329,6 +329,10 @@ self = stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done + # add RPATH here so Zink can find libvulkan.so + ${lib.optionalString haveZink '' + patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so + ''} ''; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ |