Unverified Commit 99998eec authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #225172 from Artturin/gir32bitccrossfix

parents 7dd9ff8d 437c5b6e

pkgs/development/libraries/gobject-introspection/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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;