atk: clean up cross-compilation logic
This commit is contained in:
parent
25c0253f00
commit
0e81850754
|
@ -1,6 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
|
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
|
||||||
, fixDarwinDylibNames, gobject-introspection, gnome
|
, fixDarwinDylibNames, gobject-introspection, gnome
|
||||||
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -18,9 +17,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
|
nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
|
||||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||||
++ lib.optional withIntrospection gobject-introspection;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
# Required by atk.pc
|
# Required by atk.pc
|
||||||
|
@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dintrospection=${lib.boolToString withIntrospection}"
|
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
Loading…
Reference in a new issue