libsndfile: fix build on darwin

* build with gccApple
* add Carbon headers to include path
This commit is contained in:
Jason \"Don\" O'Conal 2013-07-04 15:02:09 +10:00 committed by Rok Garbas
parent 3a1a7b2d6a
commit dcc4ffdb7f
2 changed files with 34 additions and 27 deletions

View File

@ -10,11 +10,20 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig flac libogg libvorbis ]; buildInputs = [ pkgconfig flac libogg libvorbis ];
meta = { # need headers from the Carbon.framework in /System/Library/Frameworks to
description = "Libsndfile, a C library for reading and writing files containing sampled sound"; # 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 = meta = with stdenv.lib; {
'' Libsndfile is a C library for reading and writing files containing 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 ludo ];
platfomrs = platforms.unix;
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) sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
through one standard library interface. It is released in source through one standard library interface. It is released in source
code format under the GNU Lesser General Public License. code format under the GNU Lesser General Public License.
@ -32,11 +41,5 @@ stdenv.mkDerivation rec {
make it easy to extend for reading and writing new sound file make it easy to extend for reading and writing new sound file
formats. formats.
''; '';
homepage = http://www.mega-nerd.com/libsndfile/;
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }

View File

@ -4781,7 +4781,11 @@ let
# To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
libsndfile = callPackage ../development/libraries/libsndfile { }; libsndfile = callPackage ../development/libraries/libsndfile {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
libsoup = callPackage ../development/libraries/libsoup { }; libsoup = callPackage ../development/libraries/libsoup { };