Merge staging-next into staging

2020-11-03 12:06:41 +01:00
parent b810a5d23c 237966224d
commit 470f05cb5d
317 changed files with 3210 additions and 2827 deletions
@@ -3,7 +3,7 @@
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
-, libpulseaudio
+, libpulseaudio, pcsclite

 , homepage, version, prefix, hash

@@ -103,6 +103,7 @@ stdenv.mkDerivation rec {

  runtimeDependencies = [
    glib
+    pcsclite

    xorg.libX11
    xorg.libXScrnSaver