dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #309309 from Artturin/glibbuildgironcros

Browse Source 
glib: enable introspection on cross
This commit is contained in:
Artturin 2024-05-07 18:25:39 +03:00 committed by GitHub
commit 4c2a6867fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glib/default.nix
View File

@ -22,7 +22,8 @@
, makeHardcodeGsettingsPatch , makeHardcodeGsettingsPatch
, testers , testers
, gobject-introspection , gobject-introspection
, withIntrospection ? stdenv.buildPlatform.canExecute stdenv.hostPlatform && lib.meta.availableOn stdenv.hostPlatform gobject-introspection , mesonEmulatorHook
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && lib.meta.availableOn stdenv.hostPlatform gobject-introspection
}: }:
assert stdenv.isLinux -> util-linuxMinimal != null; assert stdenv.isLinux -> util-linuxMinimal != null;
@ -150,6 +151,8 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals withIntrospection [ ] ++ lib.optionals withIntrospection [
gi-docgen gi-docgen
gobject-introspection' gobject-introspection'
] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
mesonEmulatorHook
]; ];
propagatedBuildInputs = [ zlib libffi gettext libiconv ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ];