From 4858690d800a3fc517db58a49ec56dffe89fe7ce Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 16 Jan 2023 10:55:04 +0100 Subject: [PATCH] bottles: 2022.12.14.1 -> 50.2 --- pkgs/applications/misc/bottles/default.nix | 4 ++-- pkgs/applications/misc/bottles/fhsenv.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index e39612f9ee1c2f2..f3d65ebd9ca298e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -28,13 +28,13 @@ }: 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 index 43923c99eae32fe..85c816994d8f26d 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -91,10 +91,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/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0/usr/lib64/gstreamer-1.0 ''; }; in