From 54c9c0b4a70635f4158fcc48e60168e1e1406fa0 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 2 Jan 2015 17:35:02 +0100
Subject: [PATCH 1/3] mjpg-streamer: added package

---
 .../video/mjpg-streamer/default.nix           | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/video/mjpg-streamer/default.nix

diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
new file mode 100644
index 000000000000..47e496ef33c6
--- /dev/null
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchsvn, pkgconfig, libjpeg, imagemagick, libv4l}:
+
+stdenv.mkDerivation rec {
+  rev = "182";
+  name = "mjpg-streamer-${rev}";
+
+  src = fetchsvn {
+    url = https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer;
+    inherit rev;
+    sha256 = "008k2wk6xagprbiwk8fvzbz4dd6i8kzrr9n62gj5i1zdv7zcb16q";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile "make -C plugins\/input_gspcav1" "# make -C plugins\/input_gspcav1"
+    substituteInPlace Makefile "cp plugins\/input_gspcav1\/input_gspcav1.so" "# cp plugins\/input_gspcav1\/input_gspcav1.so"
+  '';
+
+  # Make sure mjpeg-streamer will look in "$out/lib/plugins" for its plugins.
+  NIX_LDFLAGS = "-rpath $out/lib:$out/lib/plugins";
+  dontPatchELF = true;
+
+  makeFlags = "DESTDIR=$(out)";
+
+  preInstall = ''
+    mkdir -p $out/{bin,lib}
+  '';
+
+  buildInputs = [ pkgconfig libjpeg imagemagick libv4l ];
+  
+  meta = {
+    homepage = http://sourceforge.net/projects/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";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a798391ccd94..9913a61dac48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9406,6 +9406,8 @@ let
     inherit (vamp) vampSDK;
   };
 
+  mjpg_streamer = callPackage ../applications/video/mjpg-streamer { };
+
   mmex = callPackage ../applications/office/mmex { };
 
   moc = callPackage ../applications/audio/moc { };

From 7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 20 Jan 2015 10:24:27 +0100
Subject: [PATCH 2/3] mjpg-streamer: use postFixup instead of dontPatchElf and
 NIX_LDFLAGS

---
 pkgs/applications/video/mjpg-streamer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 47e496ef33c6..7cacc4fcf05e 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile "cp plugins\/input_gspcav1\/input_gspcav1.so" "# cp plugins\/input_gspcav1\/input_gspcav1.so"
   '';
 
-  # Make sure mjpeg-streamer will look in "$out/lib/plugins" for its plugins.
-  NIX_LDFLAGS = "-rpath $out/lib:$out/lib/plugins";
-  dontPatchELF = true;
+  postFixup = ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib:$out/lib/plugins" $out/bin/mjpg_streamer
+  '';
 
   makeFlags = "DESTDIR=$(out)";
 

From d4b80026dfd04a6a38947bc556304596cf12a663 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 20 Jan 2015 23:28:35 +0100
Subject: [PATCH 3/3] mjpg-streamer: renamed attribute mjpg_streamer to
 mjpg-streamer

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9913a61dac48..cf2b130bd8bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9406,7 +9406,7 @@ let
     inherit (vamp) vampSDK;
   };
 
-  mjpg_streamer = callPackage ../applications/video/mjpg-streamer { };
+  mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
 
   mmex = callPackage ../applications/office/mmex { };