cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172291 from trofi/workaround-fno-common-for-cataract

Browse source 
cataract: add -fcommon workaround
This commit is contained in:
Bobby Rong 2022-05-14 23:00:53 +08:00 committed by GitHub
commit 267e232035
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/cataract/build.nix
View file

@ -26,6 +26,12 @@ stdenv.mkDerivation {
sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp 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 = '' installPhase = ''
mkdir $out/{bin,share} -p mkdir $out/{bin,share} -p
cp src/cgg{,-dirgen} $out/bin/ cp src/cgg{,-dirgen} $out/bin/