lol

ibus: fix cross compilation (#346076)

authored by misuzu.tngl.sh and committed by

GitHub 3f056db5 692575b1

+12 -3
+12 -3
pkgs/tools/inputmethods/ibus/default.nix
··· 37 37 38 38 let 39 39 python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); 40 - python3BuildEnv = python3.buildEnv.override { 40 + python3BuildEnv = python3.pythonOnBuildForHost.buildEnv.override { 41 41 # ImportError: No module named site 42 42 postBuild = '' 43 43 makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH ··· 97 97 # The `AX_PROG_{CC,CXX}_FOR_BUILD` autoconf macros can pick up unwrapped GCC binaries, 98 98 # so we set `{CC,CXX}_FOR_BUILD` to override that behavior. 99 99 # https://github.com/NixOS/nixpkgs/issues/21751 100 - "CC_FOR_BUILD=${stdenv.cc}/bin/cc" 101 - "CXX_FOR_BUILD=${stdenv.cc}/bin/c++" 100 + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" 101 + "CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++" 102 + "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" 103 + "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen" 102 104 "--disable-memconf" 103 105 (lib.enableFeature (dconf != null) "dconf") 104 106 (lib.enableFeature (libnotify != null) "libnotify") ··· 109 111 "--enable-install-tests" 110 112 "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" 111 113 "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations" 114 + "--with-python=${python3BuildEnv.interpreter}" 112 115 "--with-ucd-dir=${unicode-character-database}/share/unicode" 113 116 ]; 114 117 115 118 makeFlags = [ 116 119 "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" 117 120 "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" 121 + ]; 122 + 123 + 124 + depsBuildBuild = [ 125 + pkg-config 118 126 ]; 119 127 120 128 nativeBuildInputs = [ ··· 146 154 json-glib 147 155 libnotify 148 156 libdbusmenu-gtk3 157 + vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) 149 158 ] ++ lib.optionals withWayland [ 150 159 libxkbcommon 151 160 wayland