bottles: 51.11 -> 51.13 (#325983)

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,7 +59,9 @@ python3Packages.buildPythonApplication rec {
     libadwaita
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs =
+    with python3Packages;
+    [
       pathvalidate
       pycurl
       pyyaml
@@ -76,7 +77,8 @@ python3Packages.buildPythonApplication rec {
       idna
       orjson
       icoextract
-  ] ++ [
+    ]
+    ++ [
       cabextract
       p7zip
       xdpyinfo
@@ -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";
   };

pkgs/applications/misc/bottles/fhsenv.nix

@@ -1,24 +1,31 @@
-{ buildFHSEnv
-, symlinkJoin
-, bottles-unwrapped
-, extraPkgs ? pkgs: [ ]
-, extraLibraries ? pkgs: [ ]
+{
+  buildFHSEnv,
+  symlinkJoin,
+  bottles-unwrapped,
+  extraPkgs ? pkgs: [ ],
+  extraLibraries ? pkgs: [ ],
 }:
 
-let fhsEnv = {
+let
+  fhsEnv = {
     # Many WINE games need 32bit
     multiArch = true;
 
-  targetPkgs = pkgs: with 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;
+      ]
+      ++ extraPkgs pkgs;
 
     multiPkgs =
       let
-      xorgDeps = pkgs: with pkgs.xorg; [
+        xorgDeps =
+          pkgs: with pkgs.xorg; [
             libpthreadstubs
             libSM
             libX11
@@ -36,7 +43,8 @@ let fhsEnv = {
             libXv
             libXxf86vm
           ];
-      gstreamerDeps = pkgs: with pkgs.gst_all_1; [
+        gstreamerDeps =
+          pkgs: with pkgs.gst_all_1; [
             gstreamer
             gst-plugins-base
             gst-plugins-good
@@ -45,7 +53,9 @@ let fhsEnv = {
             gst-libav
           ];
       in
-    pkgs: with pkgs; [
+      pkgs:
+      with pkgs;
+      [
         # https://wiki.winehq.org/Building_Wine
         alsa-lib
         cups
@@ -91,16 +101,29 @@ let fhsEnv = {
         libgpg-error
         p11-kit
         zlib # Freetype
-    ] ++ xorgDeps pkgs
+      ]
+      ++ 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

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",