ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21130 from tohl/master

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

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

3
pkgs/development/compilers/ecl/default.nix
View File

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

2
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora 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 ] ++ optional openglSupport mesa
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional ((isLinux || isFreeBSD) && !isArm) libva

4
pkgs/tools/networking/stunnel/default.nix
View File

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