diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-15 07:08:19 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-15 07:08:29 +0200 |
| commit | d1b77f990ff0933c167ead787253b4a7120d62bd (patch) | |
| tree | e9b80ba583105fd0addf222e9f6eb1a5d69beb3f /pkgs/misc | |
| parent | cd6eea51c4159e1653b8e16e1b400e8b192de48f (diff) | |
| parent | 826104819b3255d25a0e845c49f78fa72483d701 (diff) | |
Merge branch 'staging-next' into staging
Conflicts: pkgs/applications/networking/browsers/firefox/common.nix between f6c57619358d51e71a5298503c84e1c1ce4f9f12 and a373324120a271fdbff202b61895e06aecf98923.
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 = [ |