Merge pull request #21130 from tohl/master

small fixes
This commit is contained in:
Jörg Thalheim 2016-12-14 14:35:05 +01:00 committed by GitHub
commit c3edaab52d
4 changed files with 7 additions and 6 deletions

View file

@ -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; {

View file

@ -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}"
]

View file

@ -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

View file

@ -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 ];