From ab9d8b8a7c651c63c1dcd023839c31c7091f4ad0 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Tue, 9 Jul 2024 20:38:16 -0500 Subject: [PATCH] bottles: 51.11 -> 51.13 --- pkgs/applications/misc/bottles/default.nix | 129 +++++------ pkgs/applications/misc/bottles/fhsenv.nix | 209 ++++++++++-------- .../misc/bottles/vulkan_icd.patch | 2 +- 3 files changed, 184 insertions(+), 156 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 495a945d32d3..bc9d3cb2e444 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,45 +1,44 @@ -{ lib -, fetchFromGitHub -, gitUpdater -, python3Packages -, blueprint-compiler -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils -, librsvg -, gtk4 -, gtksourceview5 -, libadwaita -, cabextract -, p7zip -, xdpyinfo -, imagemagick -, lsb-release -, pciutils -, procps -, gamescope -, mangohud -, vkbasalt-cli -, vmtouch +{ + lib, + fetchFromGitHub, + gitUpdater, + python3Packages, + blueprint-compiler, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, + librsvg, + gtk4, + gtksourceview5, + libadwaita, + cabextract, + p7zip, + xdpyinfo, + imagemagick, + lsb-release, + pciutils, + procps, + gamescope, + mangohud, + vkbasalt-cli, + vmtouch, }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.11"; + version = "51.13"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y="; + hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4="; }; - patches = [ - ./vulkan_icd.patch - ]; + patches = [ ./vulkan_icd.patch ]; # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ @@ -60,38 +59,41 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - propagatedBuildInputs = with python3Packages; [ - pathvalidate - pycurl - pyyaml - requests - pygobject3 - patool - markdown - fvs - pefile - urllib3 - chardet - certifi - idna - orjson - icoextract - ] ++ [ - cabextract - p7zip - xdpyinfo - imagemagick - vkbasalt-cli + propagatedBuildInputs = + with python3Packages; + [ + pathvalidate + pycurl + pyyaml + requests + pygobject3 + patool + markdown + fvs + pefile + urllib3 + chardet + certifi + idna + orjson + icoextract + ] + ++ [ + cabextract + p7zip + xdpyinfo + imagemagick + vkbasalt-cli - gamescope - mangohud - vmtouch + gamescope + mangohud + vmtouch - # Undocumented (subprocess.Popen()) - lsb-release - pciutils - procps - ]; + # Undocumented (subprocess.Popen()) + lsb-release + pciutils + procps + ]; format = "other"; dontWrapGApps = true; # prevent double wrapping @@ -107,7 +109,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ psydvl shamilton ]; + maintainers = with maintainers; [ + psydvl + shamilton + ]; platforms = platforms.linux; mainProgram = "bottles"; }; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index fd0d38f69892..1bd476a136c6 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -1,106 +1,129 @@ -{ buildFHSEnv -, symlinkJoin -, bottles-unwrapped -, extraPkgs ? pkgs: [ ] -, extraLibraries ? pkgs: [ ] +{ + buildFHSEnv, + symlinkJoin, + bottles-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: -let fhsEnv = { - # Many WINE games need 32bit - multiArch = true; +let + fhsEnv = { + # Many WINE games need 32bit + multiArch = true; - targetPkgs = pkgs: with pkgs; [ - bottles-unwrapped - # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) - # See https://github.com/bottlesdevs/Bottles/issues/2401 - vkbasalt - ] ++ extraPkgs pkgs; + targetPkgs = + pkgs: + with pkgs; + [ + bottles-unwrapped + # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) + # See https://github.com/bottlesdevs/Bottles/issues/2401 + vkbasalt + ] + ++ extraPkgs pkgs; - multiPkgs = - let - xorgDeps = pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm - ]; - gstreamerDeps = pkgs: with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]; - in - pkgs: with pkgs; [ - # https://wiki.winehq.org/Building_Wine - alsa-lib - cups - dbus - fontconfig - freetype - glib - gnutls - libglvnd - gsm - libgphoto2 - libjpeg_turbo - libkrb5 - libpcap - libpng - libpulseaudio - libtiff - libunwind - libusb1 - libv4l - libxml2 - mpg123 - ocl-icd - openldap - samba4 - sane-backends - SDL2 - udev - vulkan-loader + multiPkgs = + let + xorgDeps = + pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + gstreamerDeps = + pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; + in + pkgs: + with pkgs; + [ + # https://wiki.winehq.org/Building_Wine + alsa-lib + cups + dbus + fontconfig + freetype + glib + gnutls + libglvnd + gsm + libgphoto2 + libjpeg_turbo + libkrb5 + libpcap + libpng + libpulseaudio + libtiff + libunwind + libusb1 + libv4l + libxml2 + mpg123 + ocl-icd + openldap + samba4 + sane-backends + SDL2 + udev + vulkan-loader - # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ - alsa-plugins - dosbox - giflib - gtk3 - libva - libxslt - ncurses - openal + # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ + alsa-plugins + dosbox + giflib + gtk3 + libva + libxslt + ncurses + openal - # Steam runtime - libgcrypt - libgpg-error - p11-kit - zlib # Freetype - ] ++ xorgDeps pkgs - ++ gstreamerDeps pkgs - ++ extraLibraries pkgs; -}; + # Steam runtime + libgcrypt + libgpg-error + p11-kit + zlib # Freetype + ] + ++ xorgDeps pkgs + ++ gstreamerDeps pkgs + ++ extraLibraries pkgs; + }; in symlinkJoin { name = "bottles"; paths = [ - (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; })) - (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles"; + runScript = "bottles"; + } + )) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles-cli"; + runScript = "bottles-cli"; + } + )) ]; postBuild = '' mkdir -p $out/share diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch index ff376e136bb2..e1c402727d89 100644 --- a/pkgs/applications/misc/bottles/vulkan_icd.patch +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -6,7 +6,7 @@ index 6673493..9191004 100644 "/usr/share/vulkan", "/etc/vulkan", "/usr/local/share/vulkan", -- "/usr/local/etc/vulkan" +- "/usr/local/etc/vulkan", + "/usr/local/etc/vulkan", + "/run/opengl-driver/share/vulkan", + "/run/opengl-driver-32/share/vulkan",