droidcam and magit improvements

This commit is contained in:
Andrea Ciceri 2022-04-24 13:25:23 +02:00
parent 8175759a71
commit 39521036fb
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
11 changed files with 98 additions and 5 deletions

View file

@ -26,5 +26,7 @@ in
geoclue2 = nixpkgsUnstable.geoclue2;
gnome = nixpkgsUnstable.gnome;
umoria = nixpkgsDev.umoria;
droidcam = prev.callPackage (import ./droidcam) { };
v4l2loopback-dc = prev.callPackage (import ./v4l2loopback-dc) { kernel = prev.linux; };
# then, call packages with `final.callPackage`
}

36
pkgs/droidcam/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ stdenv, fetchzip, pkgconfig, ffmpeg, gtk3-x11, libjpeg, libusbmuxd, alsaLib, speex }:
stdenv.mkDerivation rec {
pname = "droidcam";
version = "0";
src = fetchzip {
url = "https://github.com/dev47apps/droidcam/archive/refs/tags/v1.7.2.zip";
sha256 = "1iskvs5p71gkiinj78kkl9ygl5il9rdbzm0h85hwyzm2xwkcybrp";
};
sourceRoot = "source";
buildInputs = [ pkgconfig ];
nativeBuildInputs = [ ffmpeg gtk3-x11 libusbmuxd alsaLib libjpeg speex ];
postPatch = ''
cat Makefile
ls ${libusbmuxd.out}/lib
sed -i -e 's:-lusbmuxd:-I ${libusbmuxd.out} ${libusbmuxd.out}/lib/libusbmuxd-2.0.so:' Makefile
sed -i -e 's:/opt/libjpeg-turbo:${libjpeg.out}:' Makefile
sed -i -e 's:$(JPEG_DIR)/lib`getconf LONG_BIT`:${libjpeg.out}/lib:' Makefile
sed -i -e 's:libturbojpeg.a:libturbojpeg.so:' Makefile
cat Makefile
'';
installPhase = ''
mkdir -p $out/bin
cp droidcam droidcam-cli $out/bin/
'';
meta = with stdenv.lib; {
description = "DroidCam Linux client";
homepage = https://github.com/aramg/droidcam;
};
}

View file

@ -12,6 +12,7 @@ emacsWithPackages (
all-the-icons
company
dap-mode
diff-hl
doom-modeline
evil
evil-collection

View file

@ -0,0 +1,32 @@
{ stdenv, fetchzip, kernel }:
stdenv.mkDerivation rec {
pname = "v4l2loopback-dc";
version = "0";
src = fetchzip {
url = "https://github.com/dev47apps/droidcam/archive/refs/tags/v1.7.2.zip";
sha256 = "1iskvs5p71gkiinj78kkl9ygl5il9rdbzm0h85hwyzm2xwkcybrp";
};
sourceRoot = "source/v4l2loopback";
KVER = "${kernel.modDirVersion}";
KBUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
nativeBuildInputs = kernel.moduleBuildDependencies;
postPatch = ''
sed -i -e 's:/lib/modules/$(KERNELRELEASE)/build:${KBUILD_DIR}:g' Makefile
'';
installPhase = ''
mkdir -p $out/lib/modules/${KVER}/kernels/media/video
cp v4l2loopback-dc.ko $out/lib/modules/${KVER}/kernels/media/video/
'';
meta = with stdenv.lib; {
description = "DroidCam kernel module v4l2loopback-dc";
homepage = https://github.com/aramg/droidcam;
};
}