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

soxr, libraw, fftw, imagemagick: fix build by a hack

Browse Source
This commit is contained in:
Vladimír Čunát 2015-04-20 20:26:09 +02:00
parent a56da607b1
commit 082843bdeb
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg
lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp
libxml2 libxml2 (stdenv.cc.cc.lib or null)
]; ];
propagatedBuildInputs = [] propagatedBuildInputs = []

4
pkgs/applications/misc/audio/soxr/default.nix
View File

@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src
''; '';
buildInputs = [ cmake ]; buildInputs = [ cmake (stdenv.cc.cc.lib or null) ];
# outputs TODO: gcc.lib might become a problem;
# here -out/lib/*.a got found and -lib/lib/*.so didn't
meta = { meta = {
description = "An audio resampling library"; description = "An audio resampling library";

2
pkgs/development/libraries/fftw/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
}; };
buildInputs = [ (stdenv.cc.cc.lib or null) ];
configureFlags = configureFlags =
[ "--enable-shared" "--disable-static" [ "--enable-shared" "--disable-static"
"--enable-threads" "--enable-threads"

4
pkgs/development/libraries/libraw/default.nix
View File

@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i"; sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
}; };
buildInputs = [ lcms2 jasper ] ; buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
meta = { meta = {
description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
homepage = http://www.libraw.org/; homepage = http://www.libraw.org/;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;