From f23fccab4f6d1cb8d384bb66ec53a1bfba0f0ab1 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Wed, 5 Mar 2025 08:11:52 -0500 Subject: [PATCH] mangojuice: use vkbasalt --- pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch | 13 +++++++++++++ pkgs/by-name/ma/mangojuice/package.nix | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch diff --git a/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch new file mode 100644 index 000000000000..194574d7f86f --- /dev/null +++ b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/mangojuice.vala b/src/mangojuice.vala +index 8c2cbef..46e7f73 100644 +--- a/src/mangojuice.vala ++++ b/src/mangojuice.vala +@@ -2566,7 +2566,7 @@ public class MangoJuice : Adw.Application { + } + + async bool check_vkbasalt_installed_async () { +- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" }; ++ string[] paths = { "@vkbasalt@" }; + foreach (var path in paths) { + if (FileUtils.test (path, FileTest.EXISTS)) { + return true; diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index ae807d65288b..aab7000014e8 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -7,6 +7,7 @@ vala, pkg-config, makeBinaryWrapper, + replaceVars, gtk4, libadwaita, @@ -18,6 +19,7 @@ mangohud, mesa-demos, vulkan-tools, + vkbasalt, nix-update-script, }: @@ -32,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NpNsYwktcce9R1LpoIL2vh5UzsgDqdPyS0D3mhM3F0w="; }; + patches = [ + (replaceVars ./fix-vkbasalt-path.patch { + vkbasalt = lib.getLib vkbasalt + "/lib/vkbasalt/libvkbasalt.so"; + }) + ]; + nativeBuildInputs = [ meson ninja