diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-25 17:43:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:17:07 +0100 |
| commit | 6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115 (patch) | |
| tree | 1ab3caae534620a8b073742654034d9ad13b7568 /pkgs | |
| parent | 8adabe6679c51df5d4cd40b52c2f639324ad645e (diff) | |
| download | nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar.gz nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar.bz2 nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar.lz nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar.xz nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.tar.zst nixpkgs-6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115.zip | |
imagemagick, soxr, fftw, libraw: remove explicit gcc.lib
It is no longer needed after cc-wrapper fixes.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/misc/audio/soxr/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libraw/default.nix | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9483809bf66..c25cc11c203 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg openexr libpng librsvg libtiff 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 dd2e560c00f..941e1a393b1 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -17,9 +17,6 @@ stdenv.mkDerivation rec { ''; 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 = { description = "An audio resampling library"; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 020d07dcc0f..0e07519da11 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "doc" ]; # it's dev-doc only outputBin = "dev"; # fftw-wisdom - 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 928b251b3af..031886d3451 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; }; - buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ; + buildInputs = [ lcms2 jasper ]; nativeBuildInputs = [ pkgconfig ]; |