From 7dd1a199dbfed2836aa413abeae7ed080eb9cbf1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Jul 2020 23:47:20 -0400 Subject: [PATCH 1/3] motion: 4.3.0 -> 4.3.1 --- pkgs/applications/video/motion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index 175958afb7e..f6955cdeb76 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; - rev = "Release-${version}"; - sha256 = "08mm7ajgs0qnrydywxxyzcll09z80crjnjkjnckdi6ljsj6s96j8"; + rev = "release-${version}"; + sha256 = "01yy4pdgd4wa97bpw27zn5zik9iz719m1jiwkk9lb7m2a2951dhc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From f84294c787356a76632b94ee4b4fe330602c1996 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Jul 2020 23:47:54 -0400 Subject: [PATCH 2/3] motion: switch ffmpeg_3 to ffmpeg --- pkgs/applications/video/motion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index f6955cdeb76..df28190a9e0 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, ffmpeg_3, libjpeg, libmicrohttpd }: +, ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { pname = "motion"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ffmpeg_3 libjpeg libmicrohttpd ]; + buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; meta = with stdenv.lib; { description = "Monitors the video signal from cameras"; From a598665c4c5aff95d65cc98fb2df6ba09aa9397c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Jul 2020 23:48:07 -0400 Subject: [PATCH 3/3] motion: add meta.platforms --- pkgs/applications/video/motion/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index df28190a9e0..7f101c41edb 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://motion-project.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ puffnfresh veprbl ]; + platforms = platforms.unix; }; }