diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-14 18:01:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-14 18:01:09 +0000 |
commit | 7e7fb6332c8897916ced1394b6616ba7853d815c (patch) | |
tree | 3e8609e834a2fe209a80993d94fdb06e7bd146bc /pkgs/misc | |
parent | dae6d3bb73c4454a83ff9ad41596f01d7ea81cc4 (diff) | |
parent | c4070d4ce39adc0d27f478f9f02cafcec121be63 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/drivers/foomatic-filters/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 5804eb60930da..b1095768691da 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of + # `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installTargets = [ "install-cups" ]; installFlags = [ |