Commit f560c82d authored by Martino Fontana's avatar Martino Fontana
Browse files

bottles: 2022.10.14.1 -> 2022.11.14, fix vulkan_icd.patch

parent d6fe5fda

pkgs/applications/misc/bottles/default.nix

+11 −3
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ 
, p7zip

, xdpyinfo

, imagemagick

, lsb-release

, pciutils

, procps

, gamescope

, mangohud

, vkbasalt-cli

, vmtouch

, wine

, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
@@ -39,13 +42,13 @@ let 
in

python3Packages.buildPythonApplication rec {

  pname = "bottles";

  version = "2022.10.14.1";

  version = "2022.11.14";



  src = fetchFromGitHub {

    owner = "bottlesdevs";

    repo = pname;

    rev = version;

    sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0=";

    sha256 = "sha256-bigrJtqx9iZURYojwxlGe7xSGWS13wSaGcrTTROP9J8=";

  };



  patches = [ ./vulkan_icd.patch ];
@@ -101,12 +104,17 @@ python3Packages.buildPythonApplication rec { 
    p7zip

    xdpyinfo

    imagemagick

    procps

    vkbasalt-cli



    gamescope

    mangohud

    vmtouch

    wine



    # Undocumented (subprocess.Popen())

    lsb-release

    pciutils

    procps

  ];



  format = "other";

pkgs/applications/misc/bottles/vulkan_icd.patch

+7 −5
Original line number Diff line number Diff line 
diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py

index 6673493..07f70d1 100644

index 6673493..9191004 100644

--- a/bottles/backend/utils/vulkan.py

+++ b/bottles/backend/utils/vulkan.py

@@ -29,6 +29,8 @@ class VulkanUtils:

@@ -28,7 +28,9 @@ class VulkanUtils:

         "/usr/share/vulkan",

         "/etc/vulkan",

         "/usr/local/share/vulkan",

         "/usr/local/etc/vulkan"

+        "/run/opengl-driver/share/vulkan/",

+        "/run/opengl-driver-32/share/vulkan/",

-        "/usr/local/etc/vulkan"

+        "/usr/local/etc/vulkan",

+        "/run/opengl-driver/share/vulkan",

+        "/run/opengl-driver-32/share/vulkan",

     ]

     if "FLATPAK_ID" in os.environ:

         __vk_icd_dirs += [