pyrox.dev
bottles: 2022.10.14.1 -> 2022.11.14, fix vulkan_icd.patch
+11
-3
pkgs/applications/misc/bottles/default.nix
+11
-3
pkgs/applications/misc/bottles/default.nix
···
19
, p7zip
20
, xdpyinfo
21
, imagemagick
22
, procps
23
, gamescope
24
, mangohud
25
, vmtouch
26
, wine
27
, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
···
39
in
40
python3Packages.buildPythonApplication rec {
41
pname = "bottles";
42
-
version = "2022.10.14.1";
43
44
src = fetchFromGitHub {
45
owner = "bottlesdevs";
46
repo = pname;
47
rev = version;
48
-
sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0=";
49
};
50
51
patches = [ ./vulkan_icd.patch ];
···
101
p7zip
102
xdpyinfo
103
imagemagick
104
-
procps
105
106
gamescope
107
mangohud
108
vmtouch
109
wine
110
];
111
112
format = "other";
···
19
, p7zip
20
, xdpyinfo
21
, imagemagick
22
+
, lsb-release
23
+
, pciutils
24
, procps
25
, gamescope
26
, mangohud
27
+
, vkbasalt-cli
28
, vmtouch
29
, wine
30
, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
···
42
in
43
python3Packages.buildPythonApplication rec {
44
pname = "bottles";
45
+
version = "2022.11.14";
46
47
src = fetchFromGitHub {
48
owner = "bottlesdevs";
49
repo = pname;
50
rev = version;
51
+
sha256 = "sha256-bigrJtqx9iZURYojwxlGe7xSGWS13wSaGcrTTROP9J8=";
52
};
53
54
patches = [ ./vulkan_icd.patch ];
···
104
p7zip
105
xdpyinfo
106
imagemagick
107
+
vkbasalt-cli
108
109
gamescope
110
mangohud
111
vmtouch
112
wine
113
+
114
+
# Undocumented (subprocess.Popen())
115
+
lsb-release
116
+
pciutils
117
+
procps
118
];
119
120
format = "other";
+7
-5
pkgs/applications/misc/bottles/vulkan_icd.patch
+7
-5
pkgs/applications/misc/bottles/vulkan_icd.patch
···
1
diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py
2
-
index 6673493..07f70d1 100644
3
--- a/bottles/backend/utils/vulkan.py
4
+++ b/bottles/backend/utils/vulkan.py
5
-
@@ -29,6 +29,8 @@ class VulkanUtils:
6
"/etc/vulkan",
7
"/usr/local/share/vulkan",
8
-
"/usr/local/etc/vulkan"
9
-
+ "/run/opengl-driver/share/vulkan/",
10
-
+ "/run/opengl-driver-32/share/vulkan/",
11
]
12
if "FLATPAK_ID" in os.environ:
13
__vk_icd_dirs += [
···
1
diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py
2
+
index 6673493..9191004 100644
3
--- a/bottles/backend/utils/vulkan.py
4
+++ b/bottles/backend/utils/vulkan.py
5
+
@@ -28,7 +28,9 @@ class VulkanUtils:
6
+
"/usr/share/vulkan",
7
"/etc/vulkan",
8
"/usr/local/share/vulkan",
9
+
- "/usr/local/etc/vulkan"
10
+
+ "/usr/local/etc/vulkan",
11
+
+ "/run/opengl-driver/share/vulkan",
12
+
+ "/run/opengl-driver-32/share/vulkan",
13
]
14
if "FLATPAK_ID" in os.environ:
15
__vk_icd_dirs += [