Unverified Commit 4c2a6867 authored by Artturin's avatar Artturin Committed by GitHub
Browse files

Merge pull request #309309 from Artturin/glibbuildgironcros 

glib: enable introspection on cross
parents 4f6a41c7 98d8d1e5

pkgs/development/libraries/glib/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
, makeHardcodeGsettingsPatch

, testers

, gobject-introspection

, withIntrospection ? stdenv.buildPlatform.canExecute stdenv.hostPlatform && lib.meta.availableOn stdenv.hostPlatform gobject-introspection

, mesonEmulatorHook

, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && lib.meta.availableOn stdenv.hostPlatform gobject-introspection

}:



assert stdenv.isLinux -> util-linuxMinimal != null;
@@ -150,6 +151,8 @@ stdenv.mkDerivation (finalAttrs: { 
  ] ++ lib.optionals withIntrospection [

    gi-docgen

    gobject-introspection'

  ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

    mesonEmulatorHook

  ];



  propagatedBuildInputs = [ zlib libffi gettext libiconv ];