mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
Merge master into staging-nixos
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
obs-studio,
|
||||
ffmpeg,
|
||||
libjpeg,
|
||||
@@ -13,24 +12,15 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "droidcam-obs";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dev47apps";
|
||||
repo = "droidcam-obs-plugin";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-hxG/v15Q4D+6LU4BNV6ErSa1WvPk4kMPl07pIqiMcc4=";
|
||||
hash = "sha256-JPAQoGZFzTIdBQ7GpCPaYUVPkkcBdCRFkVPU+nyRa7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with ffmpeg 8 / libavcodec 62
|
||||
# TODO: Drop this once v2.4.3+ is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dev47apps/droidcam-obs-plugin/commit/73ec2a01e234e6b2287866c25b4242dca6d9d2f6.patch";
|
||||
hash = "sha256-AI2Z9i3+KfvmpyVX9WwX3jcA1hyUZiFO7kWRsb+8/10=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir ./build
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user