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

imagemagick, soxr, fftw, libraw: remove explicit gcc.lib

Browse Source 
It is no longer needed after cc-wrapper fixes.
This commit is contained in:
Vladimír Čunát 2015-10-25 17:43:02 +01:00
parent 8adabe6679
commit 6c75f4c9aa
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
openexr libpng librsvg libtiff libxml2 openexr libpng librsvg libtiff libxml2
libxml2 (stdenv.cc.cc.lib or null)
]; ];
propagatedBuildInputs = propagatedBuildInputs =

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

@ -17,9 +17,6 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ (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

@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom outputBin = "dev"; # fftw-wisdom
buildInputs = [ (stdenv.cc.cc.lib or null) ];
configureFlags = configureFlags =
[ "--enable-shared" "--disable-static" [ "--enable-shared" "--disable-static"
"--enable-threads" "--enable-threads"

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

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
}; };
buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ; buildInputs = [ lcms2 jasper ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];