diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-05-11 14:37:53 -0700 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-05-11 14:44:50 -0700 |
| commit | 662a6b1ca62b2e44115f6e29999f30896ddfa075 (patch) | |
| tree | de5c2d6b8130d3e1d9c89038c32a22eef2bf423a /pkgs/development/libraries/libfpx | |
| parent | 395829686d0219b3e14fe6ffae60a24b4e50370b (diff) | |
| download | nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar.gz nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar.bz2 nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar.lz nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar.xz nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.tar.zst nixpkgs-662a6b1ca62b2e44115f6e29999f30896ddfa075.zip | |
remove all references to `stdenv.cc.cc.is{GNU,Clang}`
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
Diffstat (limited to 'pkgs/development/libraries/libfpx')
| -rw-r--r-- | pkgs/development/libraries/libfpx/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 2540d22b8d4..9616461177e 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; # This dead code causes a duplicate symbol error in Clang so just remove it - postPatch = if (stdenv.cc.cc.isClang or false) then '' + postPatch = if stdenv.cc.isClang then '' substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" '' else null; |