mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
bottles: 2022.12.14 -> 2022.12.14.1, fix GStreamer
This commit is contained in:
parent
bb31220cca
commit
ed28b99cd3
2 changed files with 15 additions and 2 deletions
|
@ -28,13 +28,13 @@
|
||||||
}:
|
}:
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "bottles-unwrapped";
|
pname = "bottles-unwrapped";
|
||||||
version = "2022.12.14";
|
version = "2022.12.14.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bottlesdevs";
|
owner = "bottlesdevs";
|
||||||
repo = "bottles";
|
repo = "bottles";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-G2FQy+mea/+2RjK/WjLeX+7TP+HU6fCUFYuprFGKEyw=";
|
sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./vulkan_icd.patch ];
|
patches = [ ./vulkan_icd.patch ];
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, buildFHSUserEnvBubblewrap
|
, buildFHSUserEnvBubblewrap
|
||||||
, symlinkJoin
|
, symlinkJoin
|
||||||
, bottles-unwrapped
|
, bottles-unwrapped
|
||||||
|
, gst_all_1
|
||||||
, extraPkgs ? pkgs: [ ]
|
, extraPkgs ? pkgs: [ ]
|
||||||
, extraLibraries ? pkgs: [ ]
|
, extraLibraries ? pkgs: [ ]
|
||||||
}:
|
}:
|
||||||
|
@ -9,6 +10,8 @@
|
||||||
let fhsEnv = {
|
let fhsEnv = {
|
||||||
targetPkgs = pkgs: with pkgs; [
|
targetPkgs = pkgs: with pkgs; [
|
||||||
bottles-unwrapped
|
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
|
vkbasalt
|
||||||
] ++ extraPkgs pkgs;
|
] ++ extraPkgs pkgs;
|
||||||
|
|
||||||
|
@ -46,6 +49,9 @@ let fhsEnv = {
|
||||||
gsm
|
gsm
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
|
gst_all_1.gst-plugins-good
|
||||||
|
gst_all_1.gst-plugins-ugly
|
||||||
|
gst_all_1.gst-plugins-bad
|
||||||
libgphoto2
|
libgphoto2
|
||||||
libjpeg_turbo
|
libjpeg_turbo
|
||||||
libkrb5
|
libkrb5
|
||||||
|
@ -83,6 +89,13 @@ let fhsEnv = {
|
||||||
zlib # Freetype
|
zlib # Freetype
|
||||||
] ++ xorgDeps pkgs
|
] ++ xorgDeps pkgs
|
||||||
++ extraLibraries pkgs;
|
++ 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 ]) }
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
symlinkJoin {
|
symlinkJoin {
|
||||||
|
|
Loading…
Reference in a new issue