From d65ef03677ab395e8dfb312c32ef379046ac3472 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:34:25 +0100 Subject: [PATCH 1/4] stunnel: 5.37 -> 5.38 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 6bcf2b80a13..e9c82a798ed 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/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 ]; From b23b7a81748f8d1ae9c746de41090f2bd0448e0d Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:35:16 +0100 Subject: [PATCH 2/4] ecl: add threadSupport option --- pkgs/development/compilers/ecl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index cfaf8184c69..60293fa2ec1 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/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}" ] From e4db40ad2374aa28b59cd15027f5d7248e84bd1e Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:36:12 +0100 Subject: [PATCH 3/4] toxic: fix arm build --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 414b36b05e3..be72895b430 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/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; { From 20f138c3d7fb30340092e0569796b2b68840d9ac Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:37:06 +0100 Subject: [PATCH 4/4] ffmpeg: respect sdlSupport option --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6c40fa5dd0..0ac82f98a24 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/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