summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2025-01-11 16:00:57 -0500
committerGitHub <noreply@github.com>2025-01-11 22:00:57 +0100
commit9692553cb583e8dca46b66ab76c0eb2ada1a4098 (patch)
tree6897e88732a562dfcbda4849c5ce832a6948f540 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch
parent4408852cd4825f664d4697faf04b05ee0003276b (diff)
epson-escpr: restore correct install layout (#373003)
in 75ad85225676171bb0743533f156b58b5023c35c, some new patches were added (to deal with gcc 14, among other things). these patches disagree with the source tarball about the line endings of the files being patches. in that commit, the solution was to run dos2unix across the entire source tree. however, that produced this failure: WARNING: 'aclocal-1.15' is missing on your system. You should only need it if you modified 'acinclude.m4' or 'configure.ac' or m4 files included by 'configure.ac'. so in that same commit, automake and autoconf were added to nativeBuildInputs. this fixed that error, but it meant that the 'configure' script was regenerated. and that's a problem, because cups-filter-ppd-dirs.patch patches the 'configure' script to ensure that the installPhase doesn't introduce weird partial store paths under $out. as it turns out, there is only one file that is both touched by the new patches and comes with dos line endings in the source tarball. so, we can be much more focused with our invocation of dos2unix. this prevents the build from seeing unexpected modifications and deciding to try to clobber our patch to the 'configure' script. further, if we shift our invocation of dos2unix from the unpack phase to the patch phase, we've already cd'd into the unpacked source directory, so we don't need any obscure bash voodoo to figure out its name.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions