Merge pull request #21130 from tohl/master

small fixes

pkgs/applications/networking/instant-messengers/toxic/default.nix

@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libconfig ];
   buildInputs = [
-    libtoxcore-dev libsodium ncurses libqrencode curl
+    libtoxcore-dev libsodium ncurses curl
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
-    openal libvpx freealut
+    openal libvpx freealut libqrencode
   ];
 
   meta = with stdenv.lib; {

pkgs/development/compilers/ecl/default.nix

@@ -3,6 +3,7 @@
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
 , gcc
+, threadSupport ? true
 }:
 let
   s = # Generated upstream information
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = [
-    "--enable-threads"
+    (if threadSupport then "--enable-threads" else "--disable-threads")
     "--with-gmp-prefix=${gmp.dev}"
     "--with-libffi-prefix=${libffi.dev}"
     ]

pkgs/development/libraries/ffmpeg/generic.nix

@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
-    libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus
+    libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
   ] ++ optional openglSupport mesa
     ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isArm) libva

pkgs/tools/networking/stunnel/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.37";
+  version = "5.38";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh";
+    sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89";
   };
 
   buildInputs = [ openssl ];