Merge pull request #109266 from suhr/droidcam

This commit is contained in:
Sandro 2021-01-13 14:59:25 +01:00 committed by GitHub
commit c0ee156b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "droidcam"; pname = "droidcam";
version = "1.6"; version = "1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aramg"; owner = "aramg";
repo = "droidcam"; repo = "droidcam";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU="; sha256 = "sha256-nIqiRWk3gKOWrreyLVT8McRsXClXjOa4y8xXr1ox9Lc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,12 +29,11 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace linux/src/droidcam.c \ substituteInPlace src/droidcam.c \
--replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png"
''; '';
preBuild = '' preBuild = ''
cd linux
makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)") makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)")
makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)") makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)")
''; '';