nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-25 06:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124417 from Mindavi/atk/clean-up-cross

Browse Source 
atk: clean up cross-compilation logic
This commit is contained in:
Jan Tojnar 2021-07-07 23:04:57 +02:00 committed by GitHub
commit 23261c3f38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/atk/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
, fixDarwinDylibNames, gobject-introspection, gnome
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
}:
let
@ -18,9 +17,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
++ lib.optional withIntrospection gobject-introspection;
nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [
# Required by atk.pc
@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dintrospection=${lib.boolToString withIntrospection}"
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
];
doCheck = true;