From 437c5b6e082ed6cf7532b70ce144f1d93e4a7551 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 7 Apr 2023 18:54:18 +0300 Subject: [PATCH] gobject-introspection: fix pkgsCross.gnu32.gobject-introspection from x86_64-linux gobject-introspection-i686-unknown-linux-gnu> FAILED: gir/GLib-2.0.gir gobject-introspection-i686-unknown-linux-gnu> /build/gobject-introspection-1.74.0/build/tools/g-ir-scanner --output=gir/GLib-2.0.gir --no-libtool --quiet --reparse-validate --add-include-path /build/gobject-introspection-1.74.0/build/gir --add-include-path /build/gobject-introspectio ... gobject-introspection-i686-unknown-linux-gnu> Traceback (most recent call last): gobject-introspection-i686-unknown-linux-gnu> File "/build/gobject-introspection-1.74.0/build/tools/g-ir-scanner", line 98, in gobject-introspection-i686-unknown-linux-gnu> from giscanner.scannermain import scanner_main gobject-introspection-i686-unknown-linux-gnu> File "/build/gobject-introspection-1.74.0/build/giscanner/scannermain.py", line 35, in gobject-introspection-i686-unknown-linux-gnu> from giscanner.ast import Include, Namespace gobject-introspection-i686-unknown-linux-gnu> File "/build/gobject-introspection-1.74.0/build/giscanner/ast.py", line 29, in gobject-introspection-i686-unknown-linux-gnu> from .sourcescanner import CTYPE_TYPEDEF, CSYMBOL_TYPE_TYPEDEF gobject-introspection-i686-unknown-linux-gnu> File "/build/gobject-introspection-1.74.0/build/giscanner/sourcescanner.py", line 34, in gobject-introspection-i686-unknown-linux-gnu> from giscanner._giscanner import SourceScanner as CSourceScanner gobject-introspection-i686-unknown-linux-gnu> ImportError: /build/gobject-introspection-1.74.0/build/giscanner/_giscanner.cpython-310-x86_64-linux-gnu.so: wrong ELF class: ELFCLASS32 gobject-introspection-i686-unknown-linux-gnu> ninja: build stopped: subcommand failed. --- .../libraries/gobject-introspection/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 02d2dbb6a532..4b388cba6b96 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -79,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: { # Build definition checks for the Python modules needed at runtime by importing them. (buildPackages.python3.withPackages pythonModules) finalAttrs.setupHook # move .gir files - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; + # can't use canExecute, we need prebuilt when cross + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ (python3.withPackages pythonModules) @@ -106,8 +107,10 @@ stdenv.mkDerivation (finalAttrs: { inherit (buildPackages) bash; buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; }}" - "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" + # can't use canExecute, we need prebuilt when cross + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dgi_cross_use_prebuilt_gi=true" ]; doCheck = !stdenv.isAarch64;