diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-20 20:26:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-21 09:59:37 +0200 |
| commit | 082843bdebe3beee7399edfb30d9c393b23513b1 (patch) | |
| tree | 4a4d4118b4b6549c339ad0527618dfbbfd3d0b2f /pkgs | |
| parent | a56da607b132705052e03f79e0e41f47d27fd9b0 (diff) | |
| download | nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar.gz nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar.bz2 nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar.lz nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar.xz nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.tar.zst nixpkgs-082843bdebe3beee7399edfb30d9c393b23513b1.zip | |
soxr, libraw, fftw, imagemagick: fix build by a hack
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/audio/soxr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libraw/default.nix | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ae24b38c01..d577bcd4f94 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp - libxml2 + libxml2 (stdenv.cc.cc.lib or null) ]; propagatedBuildInputs = [] diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 084a95b962a..c1ca0bac119 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { 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 = { description = "An audio resampling library"; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 104b7229bb1..8d5166a7743 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; }; + buildInputs = [ (stdenv.cc.cc.lib or null) ]; + configureFlags = [ "--enable-shared" "--disable-static" "--enable-threads" diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f0012f552c1..a5818513690 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i"; }; - buildInputs = [ lcms2 jasper ] ; + buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = http://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; |