From 615c0d9b220326405fe4fccd827f0c2495041c7c Mon Sep 17 00:00:00 2001 From: betaboon Date: Sat, 8 Apr 2023 15:02:45 +0200 Subject: [PATCH] v4l2-relayd: remove dependency to icamerasrc --- .../os-specific/linux/v4l2-relayd/default.nix | 42 ++----------------- pkgs/top-level/all-packages.nix | 7 +--- 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2-relayd/default.nix b/pkgs/os-specific/linux/v4l2-relayd/default.nix index 293210fa9f57..a089ce8c77f8 100644 --- a/pkgs/os-specific/linux/v4l2-relayd/default.nix +++ b/pkgs/os-specific/linux/v4l2-relayd/default.nix @@ -2,27 +2,14 @@ , stdenv , fetchgit , autoreconfHook -, coreutils , glib -, gnugrep , gst_all_1 -, icamerasrc , libtool -, makeWrapper , pkg-config , which }: -let - gst = [ - gst_all_1.gstreamer.out - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - icamerasrc - ]; -in stdenv.mkDerivation rec { - pname = "v4l2-relayd-${icamerasrc.ipuVersion}"; + pname = "v4l2-relayd"; version = "0.1.3"; src = fetchgit { @@ -38,39 +25,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool - makeWrapper pkg-config which ]; buildInputs = [ glib - ] ++ gst; + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; preConfigure = "./autogen.sh --prefix=$out"; - postInstall = '' - mkdir -p $out/lib/systemd/system $out/etc/default - cp data/systemd/v4l2-relayd.service $out/lib/systemd/system - cp data/etc/default/v4l2-relayd $out/etc/default - - substituteInPlace $out/lib/systemd/system/v4l2-relayd.service \ - --replace grep ${gnugrep}/bin/grep \ - --replace cut ${coreutils}/bin/cut \ - --replace /usr/bin/test ${coreutils}/bin/test \ - --replace /usr/bin/v4l2-relayd $out/bin/v4l2-relayd \ - --replace /etc/default $out/etc/default \ - --replace "DeviceAllow=char-video4linux" "" - - substituteInPlace $out/etc/default/v4l2-relayd \ - --replace 'FORMAT=YUY2' 'FORMAT=NV12' \ - --replace 'CARD_LABEL="Virtual Camera"' 'CARD_LABEL="Intel MIPI Camera"' \ - --replace 'VIDEOSRC="videotestsrc"' 'VIDEOSRC="icamerasrc"' - - wrapProgram $out/bin/v4l2-relayd \ - --prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst} - ''; - meta = with lib; { description = "Streaming relay for v4l2loopback using GStreamer"; homepage = "https://git.launchpad.net/v4l2-relayd"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f0487330181..267bba6c434f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27426,12 +27426,7 @@ with pkgs; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; - v4l2-relayd-ipu6 = callPackage ../os-specific/linux/v4l2-relayd { - icamerasrc = gst_all_1.icamerasrc-ipu6; - }; - v4l2-relayd-ipu6ep = callPackage ../os-specific/linux/v4l2-relayd { - icamerasrc = gst_all_1.icamerasrc-ipu6ep; - }; + v4l2-relayd = callPackage ../os-specific/linux/v4l2-relayd { }; vendir = callPackage ../development/tools/vendir { };