Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-08-21 17:05:30 +02:00
1087 changed files with 30296 additions and 32019 deletions
@@ -14,33 +14,36 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "bin" "doc" ];
meta = {
description = "Libsndfile, a C library for reading and writing files containing sampled sound";
# need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
"-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
longDescription =
'' Libsndfile is a C library for reading and writing files containing
sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
through one standard library interface. It is released in source
code format under the GNU Lesser General Public License.
meta = with stdenv.lib; {
description = "A C library for reading and writing files containing sampled sound";
homepage = http://www.mega-nerd.com/libsndfile/;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ lovek323 ];
platfomrs = platforms.unix;
The library was written to compile and run on a Linux system but
should compile and run on just about any Unix (including MacOS X).
There are also pre-compiled binaries available for 32 and 64 bit
windows.
longDescription = ''
Libsndfile is a C library for reading and writing files containing
sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
through one standard library interface. It is released in source
code format under the GNU Lesser General Public License.
It was designed to handle both little-endian (such as WAV) and
big-endian (such as AIFF) data, and to compile and run correctly on
little-endian (such as Intel and DEC/Compaq Alpha) processor systems
as well as big-endian processor systems such as Motorola 68k, Power
PC, MIPS and SPARC. Hopefully the design of the library will also
make it easy to extend for reading and writing new sound file
formats.
'';
The library was written to compile and run on a Linux system but
should compile and run on just about any Unix (including MacOS X).
There are also pre-compiled binaries available for 32 and 64 bit
windows.
homepage = http://www.mega-nerd.com/libsndfile/;
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
It was designed to handle both little-endian (such as WAV) and
big-endian (such as AIFF) data, and to compile and run correctly on
little-endian (such as Intel and DEC/Compaq Alpha) processor systems
as well as big-endian processor systems such as Motorola 68k, Power
PC, MIPS and SPARC. Hopefully the design of the library will also
make it easy to extend for reading and writing new sound file
formats.
'';
};
}