Skip to content

Commit

Permalink
Merge pull request #123923 from Mindavi/atk/cross-compile
Browse files Browse the repository at this point in the history
atk: support cross-compilation by disabling introspection
  • Loading branch information
7c6f434c authored May 22, 2021
2 parents d5714df + 25c0253 commit 73ca665
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkgs/development/libraries/atk/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
, fixDarwinDylibNames, gobject-introspection, gnome
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
}:

let
Expand All @@ -17,8 +18,9 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" ];

nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
++ lib.optional withIntrospection gobject-introspection;

propagatedBuildInputs = [
# Required by atk.pc
Expand All @@ -31,6 +33,10 @@ stdenv.mkDerivation rec {
./fix_pc.patch
];

mesonFlags = [
"-Dintrospection=${lib.boolToString withIntrospection}"
];

doCheck = true;

passthru = {
Expand Down

0 comments on commit 73ca665

Please sign in to comment.