diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
| commit | 79a03641d58f351454051bf2320e94508525a41b (patch) | |
| tree | 8fa1b8870eb83ffb282848d8cf1363e542fd126d /pkgs/applications/video | |
| parent | 7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288 (diff) | |
| parent | 74c24385cb2864f937031df74af14fc8060e1540 (diff) | |
| download | nixlib-79a03641d58f351454051bf2320e94508525a41b.tar nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.gz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.bz2 nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.lz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.xz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.zst nixlib-79a03641d58f351454051bf2320e94508525a41b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mjpg-streamer/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index f9d4d4698faf..70dc156d6802 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mjpg-streamer-${version}"; - version = "2016-03-08"; + version = "unstable-2019-05-24"; src = fetchFromGitHub { owner = "jacksonliam"; repo = "mjpg-streamer"; - rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8"; - sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m"; + rev = "501f6362c5afddcfb41055f97ae484252c85c912"; + sha256 = "1cl159svfs1zzzrd3zgn4x7qy6751bvlnxfwf5hn5fmg4iszajw7"; }; prePatch = '' @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mjpg-streamer/; + homepage = "https://github.com/jacksonliam/mjpg-streamer"; description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; license = licenses.gpl2; + maintainers = with maintainers; [ gebner ]; }; } |