diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-10 07:47:15 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-10 07:47:37 +0100 |
| commit | c95a1d47240ca4808186d941b4e08a28a957bb08 (patch) | |
| tree | 7bb59c7f063b4df0ddf43b44d090203a9aeb73c4 | |
| parent | ab456c4d4583721157a2e4d48904709e3471ebc7 (diff) | |
| download | nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar.gz nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar.bz2 nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar.lz nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar.xz nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.tar.zst nixpkgs-c95a1d47240ca4808186d941b4e08a28a957bb08.zip | |
cataract: add -fcommon workaround
Without the change -fno-common toolchains like upstream gcc-10
fail to build as:
ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of
`stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here
| -rw-r--r-- | pkgs/applications/misc/cataract/build.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 0adab84830d..2c369e64b5d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp ''; + # Add workaround for -fno-common toolchains like upstream gcc-10 to + # avoid build failures like: + # ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of + # `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ |