swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123923 from Mindavi/atk/cross-compile

Browse source 
atk: support cross-compilation by disabling introspection
This commit is contained in:
Michael Raskin 2021-05-22 07:09:03 +00:00 committed by GitHub
parent d5714df652 25c0253f00
commit 73ca6652d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/atk/default.nix
View file

@ -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 = {