pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #21130 from tohl/master

small fixes

authored by Jörg Thalheim and committed by GitHub c3edaab5 b8d31beb

+7 -6
unified split
+2 -2
pkgs/applications/networking/instant-messengers/toxic/default.nix
··· 17 18 nativeBuildInputs = [ pkgconfig libconfig ]; 19 buildInputs = [ 20 - libtoxcore-dev libsodium ncurses libqrencode curl 21 ] ++ stdenv.lib.optionals (!stdenv.isArm) [ 22 - openal libvpx freealut 23 ]; 24 25 meta = with stdenv.lib; {
··· 17 18 nativeBuildInputs = [ pkgconfig libconfig ]; 19 buildInputs = [ 20 + libtoxcore-dev libsodium ncurses curl 21 ] ++ stdenv.lib.optionals (!stdenv.isArm) [ 22 + openal libvpx freealut libqrencode 23 ]; 24 25 meta = with stdenv.lib; {
+2 -1
pkgs/development/compilers/ecl/default.nix
··· 3 , gmp, mpfr, libffi, makeWrapper 4 , noUnicode ? false 5 , gcc 6 }: 7 let 8 s = # Generated upstream information ··· 30 }; 31 32 configureFlags = [ 33 - "--enable-threads" 34 "--with-gmp-prefix=${gmp.dev}" 35 "--with-libffi-prefix=${libffi.dev}" 36 ]
··· 3 , gmp, mpfr, libffi, makeWrapper 4 , noUnicode ? false 5 , gcc 6 + , threadSupport ? true 7 }: 8 let 9 s = # Generated upstream information ··· 31 }; 32 33 configureFlags = [ 34 + (if threadSupport then "--enable-threads" else "--disable-threads") 35 "--with-gmp-prefix=${gmp.dev}" 36 "--with-libffi-prefix=${libffi.dev}" 37 ]
+1 -1
pkgs/development/libraries/ffmpeg/generic.nix
··· 148 149 buildInputs = [ 150 bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora 151 - libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus 152 ] ++ optional openglSupport mesa 153 ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM 154 ++ optional ((isLinux || isFreeBSD) && !isArm) libva
··· 148 149 buildInputs = [ 150 bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora 151 + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus 152 ] ++ optional openglSupport mesa 153 ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM 154 ++ optional ((isLinux || isFreeBSD) && !isArm) libva
+2 -2
pkgs/tools/networking/stunnel/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 name = "stunnel-${version}"; 5 - version = "5.37"; 6 7 src = fetchurl { 8 url = "http://www.stunnel.org/downloads/${name}.tar.gz"; 9 - sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh"; 10 }; 11 12 buildInputs = [ openssl ];
··· 2 3 stdenv.mkDerivation rec { 4 name = "stunnel-${version}"; 5 + version = "5.38"; 6 7 src = fetchurl { 8 url = "http://www.stunnel.org/downloads/${name}.tar.gz"; 9 + sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89"; 10 }; 11 12 buildInputs = [ openssl ];