Skip to content

Commit

Permalink
asciidoc: support cross-compilation
Browse files Browse the repository at this point in the history
Be explicit in patchShebangs by suggestion of SuperSandro2000.
Enable strictDeps to enforce better support in the future.
  • Loading branch information
Mindavi committed Jul 16, 2021
1 parent 2165de1 commit 2e36e8a
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion pkgs/tools/typesetting/asciidoc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

# java is problematic on some platforms, where it is unfree
, enableJava ? true

, buildPackages
}:

assert enableStandardFeatures ->
Expand Down Expand Up @@ -157,7 +159,9 @@ stdenv.mkDerivation rec {
sha256 = "1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq";
};

strictDeps = true;
nativeBuildInputs = [ python3 unzip autoreconfHook ];
buildInputs = [ python3 ];

# install filters early, so their shebangs are patched too
postPatch = with lib; ''
Expand Down Expand Up @@ -262,7 +266,20 @@ stdenv.mkDerivation rec {
-e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
-i a2x.py
'') + ''
patchShebangs .
patchShebangs --host \
asciidoc.py \
a2x.py \
tests/testasciidoc.py \
filters/code/code-filter.py \
filters/latex/latex2img.py \
filters/music/music2png.py \
filters/unwraplatex.py \
filters/graphviz/graphviz2png.py
# Hardcode the path to its own asciidoc.
# This helps with cross-compilation.
substituteInPlace a2x.py \
--replace "find_executable(ASCIIDOC)" "'${placeholder "out"}/bin/asciidoc'"
# Note: this substitution will not work in the planned 10.0.0 release:
#
Expand All @@ -273,6 +290,10 @@ stdenv.mkDerivation rec {
# --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980"
substituteInPlace Makefile.in \
--replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980"
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
# We want to use asciidoc from the build platform to build the documentation.
substituteInPlace Makefile.in \
--replace "python3 a2x.py" "python3 ${buildPackages.asciidoc}/bin/a2x.py"
'';

preInstall = "mkdir -p $out/etc/vim";
Expand Down

0 comments on commit 2e36e8a

Please sign in to comment.