colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libsamplerate: Use default gcc

Browse Source
This commit is contained in:
Eelco Dolstra 2014-07-23 11:45:44 +02:00
parent b52da47cf1
commit eb6c0826c5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libsamplerate/default.nix
View File

@ -15,10 +15,14 @@ stdenv.mkDerivation rec {
#--disable-fftw disable usage of FFTW
#--disable-cpu-clip disable tricky cpu specific clipper
# 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";
postConfigure = stdenv.lib.optionalString stdenv.isDarwin
''
# need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE+=" -I$xcodePath/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
'';
meta = with stdenv.lib; {
description = "Sample Rate Converter for audio";

6
pkgs/top-level/all-packages.nix
View File

@ -5255,11 +5255,7 @@ let
librevisa = callPackage ../development/libraries/librevisa { };
libsamplerate = callPackage ../development/libraries/libsamplerate {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
libsamplerate = callPackage ../development/libraries/libsamplerate { };
libspectre = callPackage ../development/libraries/libspectre { };