Merge branch 'master' into staging

3 files changed, 35 insertions, 2 deletions

diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
index 8c67b667a324..a0605bb7128b 100644
--- a/pkgs/applications/video/mkcast/default.nix
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for f in $out/bin/*; do #*/
-      wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"
+      wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"
     done
 
     rm -r screenkey/.bzr
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6109e96d9741..efab9703df3d 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/
-    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib
+    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix
new file mode 100644
index 000000000000..3a3e9162999a
--- /dev/null
+++ b/pkgs/applications/video/vlc/plugin.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk,
+libxcb, xlibsWrapper, gtk}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "vlc-plugin-${version}";
+  version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4
+
+  src = fetchgit {
+    url = "https://code.videolan.org/videolan/npapi-vlc.git";
+    rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";
+    sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd";
+  };
+
+  preConfigure = "sh autogen.sh";
+
+  buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb
+      xlibsWrapper gtk ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Webplugins based on libVLC (for firefox, npapi)";
+    homepage = https://code.videolan.org/videolan/npapi-vlc;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+  };
+}