Merge remote-tracking branch 'origin/master' into hardened-stdenv

10 files changed, 34 insertions, 55 deletions

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index cbaea3eb18b2..39a85a03199d 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib;
   [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
-    libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv
+    libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
   ]
     ++ optional spellcheckSupport hunspell
     ++ optional automationSupport lua
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 22b47c532e5f..e841b5f9b2e2 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -46,6 +46,6 @@ python3Packages.buildPythonApplication rec {
     homepage = https://code.launchpad.net/kazam;
     #license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.iElectric ];
+    maintainers = [ maintainers.domenkozar ];
   };
 }
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index bca0551c0017..1926913c8d04 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -121,6 +121,6 @@ in stdenv.mkDerivation rec {
       description = "Media center";
       license = stdenv.lib.licenses.gpl2;
       platforms = platforms.linux;
-      maintainers = with maintainers; [ iElectric titanous edwtjo ];
+      maintainers = with maintainers; [ domenkozar titanous edwtjo ];
     };
 }
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 1a621032125b..971588901b46 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
 # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "flaviotordini";
   };
 
-  buildInputs = [ phonon phonon_backend_vlc qt4 ];
+  buildInputs = [ phonon phonon-backend-vlc qt4 ];
   nativeBuildInputs = [ makeWrapper qmake4Hook ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/minitube \
-      --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
+      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
index c029e90f49cf..8c67b667a324 100644
--- a/pkgs/applications/video/mkcast/default.nix
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid";
     homepage = https://github.com/KeyboardFire/mkcast;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ iElectric pSub ];
+    maintainers = with maintainers; [ domenkozar pSub ];
   };
 }
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 05bd5ad980bd..ca86906d3e19 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-magic"
     "--enable-optimization"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--disable-debug"
     "--disable-profiling"
     "--disable-precompiled-headers"
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 93a52578db3a..935c37d127e6 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -10,6 +10,8 @@
 , x264
 , curl
 
+, alsaSupport ? false
+, alsaLib
 , pulseaudioSupport ? false
 , libpulseaudio
 }:
@@ -18,13 +20,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.13.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i";
+    sha256 = "05yjm58d6daya1x6v8d73gx8fb20l0icay74nx0v4si2c898vm1j";
   };
 
   nativeBuildInputs = [ cmake
@@ -39,6 +41,7 @@ in stdenv.mkDerivation rec {
                   qtx11extras
                   x264
                 ]
+                ++ optional alsaSupport alsaLib
                 ++ optional pulseaudioSupport libpulseaudio;
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
deleted file mode 100644
index 63c5f0460f28..000000000000
--- a/pkgs/applications/video/popcorntime/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper, nwjs, zip }:
-
-let
-  arch = if stdenv.system == "x86_64-linux" then "l64"
-    else if stdenv.system == "i686-linux"   then "l32" 
-    else throw "Unsupported system ${stdenv.system}";
-
-in stdenv.mkDerivation rec {
-  name = "popcorntime-${version}";
-  version = "0.4.0";
-  build = "2";
-
-  src = fetchurl {
-    url = "http://popcorntime.ag/download.php?file=popcorn-time-community-v${version}-${build}-${arch}.tar.xz";
-    sha256 =
-      if arch == "l64"
-      then "0a68d0a81d8e97c94afa0c75209056ee4b8486f400854c952bd3ad7251bd80c9"
-      else "b311c312a29d408a7c661a271d1f3a8fc83865d8a204cf026ee87e9ac173874d";
-  };
-
-  dontPatchELF = true;
-  sourceRoot = ".";
-  buildInputs  = [ zip makeWrapper ];
-
-  buildPhase = ''
-    rm Popcorn-Time
-    cat ${nwjs}/bin/nw nw.pak > Popcorn-Time
-    chmod 555 Popcorn-Time
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r * $out/
-    makeWrapper $out/Popcorn-Time $out/bin/popcorntime
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://popcorntime.sh/;
-    description = "An application that streams movies and TV shows from torrents";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bobvanderlinden rnhmjoj ];
-  };
-}
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
new file mode 100644
index 000000000000..bc7241025116
--- /dev/null
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "0.2pre4";
+
+in
+
+stdenv.mkDerivation {
+  name = "tivodecode-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
+    sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
+  };
+
+  meta = {
+    description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
+    homepage = http://tivodecode.sourceforge.net;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index 60b5b20ff241..d249d29686e4 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "TV application for Linux with apps and tools such as a teletext browser";
     license = stdenv.lib.licenses.gpl2;
     homepage = https://www.kraxel.org/blog/linux/xawtv/;
-    maintainers = with stdenv.lib.maintainers; [ iElectric ];
+    maintainers = with stdenv.lib.maintainers; [ domenkozar ];
     platforms = stdenv.lib.platforms.linux;
   };