diff options
author | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
commit | 1b979d83845945dabffebff5033cf864b41d5c64 (patch) | |
tree | 6e81ba4ab8cd28ad9fc8d9e2a3a298bc5a403042 /pkgs/applications/video | |
parent | 3f9e8601f2a8537de90f04375400538049bbdaf2 (diff) | |
parent | d93f917182dc5da7aca53fb9a847374ec0c7429a (diff) | |
download | nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.gz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.bz2 nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.lz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.xz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.zst nixlib-1b979d83845945dabffebff5033cf864b41d5c64.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/dvdauthor/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/dvdbackup/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/kino/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/wrapper.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/lxdvdrip/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/tivodecode/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 1 |
8 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 1711503314ec..7559c4c70e7d 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec{ description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index cb2a69b53ca9..4712dfac7573 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://dvdbackup.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bradediger ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 2f3193a5617a..2503d78183f3 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -91,5 +91,6 @@ stdenv.mkDerivation { description = "Non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 716eef466fb1..efd0f257ca01 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation { + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) + ")"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6e7b874841fc..a56eba3bf5a6 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index c1faaded94cf..80676b3cd0af 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -67,5 +67,6 @@ in stdenv.mkDerivation rec { homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl2; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index bc7241025116..b158bc924605 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = http://tivodecode.sourceforge.net; + platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index f8a357345348..b417489c14c0 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xine-project.org/; description = "Xlib-based interface to Xine, a video player"; + platforms = stdenv.lib.platforms.linux; }; } |