Merge pull request #177098 from trofi/workaround-fno-common-for-spaceFM

spaceFM: add -fcommon workaround
This commit is contained in:
Sergei Trofimovich 2022-06-17 20:44:34 +00:00 committed by GitHub
commit 36e999c3c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,13 @@ stdenv.mkDerivation rec {
./x11-only.patch ./x11-only.patch
]; ];
# Workaround build failure on -fno-common toolchains:
# ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of
# `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here
# TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772
# or equivalent is merged upstream.
NIX_CFLAGS_COMPILE = "-fcommon";
configureFlags = [ configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash" "--with-bash-path=${pkgs.bash}/bin/bash"
]; ];