-
-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
harfbuzz: fix cross compilation #112695
harfbuzz: fix cross compilation #112695
Conversation
Looks like it actually fails on CI due to missing gobject-introspection. Also I merged #111259, which fixes the introspection error. Though it probably still will not work without #88222. |
Oh oops, I only tried a cross build but didn't test the native build. Tomorrow I'll try to see if it can build with |
Yeah, it won't work without #88222. I'll just close this for now then. |
Would building without gi, on cross and adding it to |
This change indirectly fixes cross compilation for Emacs Fixes build errors: - src/meson.build:639:4: ERROR: Problem encountered: Introspection support is requested but it isn't available in cross builds - Program glib-mkenums mkenums found: NO
Yep, it works. I closed this because I was kind of reluctant to keep inputs conditional on cross compilation after you mentioned that they removed the error for cross builds, but I can re-open this and submit the fix. Then hopefully after #88222 is complete we can remove the |
52c6ed1
to
5f97fe5
Compare
On staging bed8668
Something broken in gtk-doc on staging, I think @SuperSandro2000 saw the same on a PR I made. Or maybe meson itself broken? I pulled this in for my own tree, and there it builds (possibly something newer on staging broke it). Or my own patches to asciidoc make the difference, that's also possible. So this patch probably works as intended. This is the patch for asciidoc, maybe it helps? Probably unrelated though.diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 849da7e606c..95e9f0c7280 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -21,6 +21,7 @@
#, epubcheck ? null
, gnused ? null
, coreutils ? null
+, buildPackages
# if true, enable all the below filters and backends
, enableExtraPlugins ? false
@@ -257,8 +258,8 @@ stdenv.mkDerivation rec {
-i a2x.py
'' else ''
sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml')|" \
- -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
- -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
+ -e "s|^XSLTPROC =.*|XSLTPROC = '${buildPackages.libxslt.bin}/bin/xsltproc'|" \
+ -e "s|^XMLLINT =.*|XMLLINT = '${buildPackages.libxml2.bin}/bin/xmllint'|" \
-i a2x.py
'') + ''
patchShebangs . |
It executes the python for the target platform on the build platform.
That shouldn't make any difference because the error is in gtk-doc. I think we need to tell gtk-doc to use the python of the build platform with some flag but I am unsure how and which. @jtojnar can you help? |
Done in #123712. |
Motivation for this change
This change indirectly fixes cross compilation for Emacs
Fixes build errors:
src/meson.build:639:4: ERROR: Problem encountered: Introspection support is requested but it isn't available in cross builds
Program glib-mkenums mkenums found: NO
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)@edolstra