diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
commit | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (patch) | |
tree | 28f7989183b690ecafdb0360c0fee406aac88bcc /pkgs/applications/video/kodi | |
parent | 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 (diff) | |
parent | 447d625edc3a488deee1c9b2e5890dd974e55ee3 (diff) | |
download | nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.gz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.bz2 nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.lz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.xz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.zst nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.zip |
Merge branch 'staging' into staging-next
This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
Diffstat (limited to 'pkgs/applications/video/kodi')
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 773c63b0036d..7953cde24139 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 |