Merge pull request #211101 from SuperSamus/bottles-update

NixOS · Jan 21, 2023 · 11b0929 · 11b0929
2 parents 2a17a3e + ece21d5
commit 11b0929
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix
@@ -26,15 +26,16 @@
 , vkbasalt-cli
 , vmtouch
 }:
+
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "2022.12.14.1";
+  version = "50.2";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     rev = version;
-    sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE=";
+    sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w=";
   };
 
   patches = [ ./vulkan_icd.patch ];

diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix
@@ -52,6 +52,7 @@ let fhsEnv = {
       gst_all_1.gst-plugins-good
       gst_all_1.gst-plugins-ugly
       gst_all_1.gst-plugins-bad
+      gst_all_1.gst-libav
       libgphoto2
       libjpeg_turbo
       libkrb5
@@ -91,10 +92,7 @@ let fhsEnv = {
     ++ extraLibraries pkgs;
 
   profile = ''
-    # Remove if merged https://github.com/bottlesdevs/Bottles/pull/2415
-    export BOTTLES_USE_SYSTEM_GSTREAMER=1
-    # Dirty hack, may be related with https://github.com/NixOS/nixpkgs/issues/148007
-    export GST_PLUGIN_PATH=${ lib.makeSearchPath "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) }
+    export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0
   '';
 };
 in