summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-28 07:43:04 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-28 07:43:04 +0200
commitfda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch)
treedba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /pkgs/applications/video
parent15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff)
parent217cf982c754f1e8506e180551c73f57c04aed7f (diff)
downloadnixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst
nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/kodi/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 773c63b0036..7953cde2413 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -13,7 +13,7 @@
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, mysql, nasm, gnutls, libva, libdrm
+, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
-      sqlite mysql.connector-c avahi lame
+      sqlite libmysqlclient avahi lame
       curl bzip2 zip unzip glxinfo xdpyinfo
       libcec libcec_platform dcadec libuuid
       libgcrypt libgpgerror libunistring