From 26a26d898abd76d936787658698a85d7b9bbbc0e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 6 May 2026 06:11:56 +0100 Subject: [PATCH] ghostscript: fix i686 build, drop upstreamed 32-bit patch Without the change the build fails on `staging` as: ``` $ nix build --no-link -f. pkgsi686Linux.ghostscript --keep-going -L ... ghostscript-with-X> applying patch /nix/store/q1dgaydqa5rvgccxz8hcwfwanqh3s71p-3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f.patch?full_index=1 ghostscript-with-X> patching file base/gdevdbit.c ghostscript-with-X> Reversed (or previously applied) patch detected! Assume -R? [n] ghostscript-with-X> Apply anyway? [n] ghostscript-with-X> Skipping patch. ghostscript-with-X> 1 out of 1 hunk ignored -- saving rejects to file base/gdevdbit.c.rej ghostscript-with-X> patching file base/gdevmpla.c ghostscript-with-X> Reversed (or previously applied) patch detected! Assume -R? [n] ghostscript-with-X> Apply anyway? [n] ghostscript-with-X> Skipping patch. ghostscript-with-X> 2 out of 2 hunks ignored -- saving rejects to file base/gdevmpla.c.rej ``` --- pkgs/by-name/gh/ghostscript/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 12ea703533fa..36b9ced6f56b 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -85,13 +85,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://salsa.debian.org/debian/ghostscript/-/raw/01e895fea033cc35054d1b68010de9818fa4a8fc/debian/patches/2010_add_build_timestamp_setting.patch"; hash = "sha256-XTKkFKzMR2QpcS1YqoxzJnyuGk/l/Y2jdevsmbMtCXA="; }) - ] - ++ lib.optionals stdenv.hostPlatform.is32bit [ - # 32 bit compat. conditional as to not cause rebuilds - (fetchpatch2 { - url = "https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f.patch?full_index=1"; - hash = "sha256-NrL4lI19x+OHaSIwV93Op/I9k2MWXxSWgbkwSGU7R6A="; - }) ]; outputs = [