diff options
author | Rick van Schijndel <rol3517@gmail.com> | 2021-05-21 22:28:04 +0200 |
---|---|---|
committer | Rick van Schijndel <rol3517@gmail.com> | 2021-05-21 23:02:05 +0200 |
commit | 25c0253f00e792ae631668ec00d003ccf7c0c304 (patch) | |
tree | 14db9409262cad9c249368644353df84c911598f | |
parent | 17689c66d46a2a1ff20ed3b1b83f8ac83aedf0bc (diff) | |
download | nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar.gz nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar.bz2 nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar.lz nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar.xz nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.tar.zst nixpkgs-25c0253f00e792ae631668ec00d003ccf7c0c304.zip |
atk: support cross-compilation by disabling introspection
-rw-r--r-- | pkgs/development/libraries/atk/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 7961211dc63..38c55731698 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform }: let @@ -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 @@ -31,6 +33,10 @@ stdenv.mkDerivation rec { ./fix_pc.patch ]; + mesonFlags = [ + "-Dintrospection=${lib.boolToString withIntrospection}" + ]; + doCheck = true; passthru = { |