public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: fix docs cross compilation (again)

Browse Source 
Do not depend on host gtk-doc when cross compiling (we do not use it
there), and document why we need a host gtk-doc in the first place.
This commit is contained in:
Pierre Bourdon 2021-04-17 14:33:00 +02:00 committed by Milan
parent 2534314225
commit e432e78d1c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,13 +92,23 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libelf setupHook pcre libelf setupHook pcre
bash gnum4 # install glib-gettextize and m4 macros for other apps to use bash gnum4 # install glib-gettextize and m4 macros for other apps to use
gtk-doc
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libselinux libselinux
util-linuxMinimal # for libmount util-linuxMinimal # for libmount
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]); ]) ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
# Note: this needs to be both in buildInputs and nativeBuildInputs. The
# Meson gtkdoc module uses find_program to look it up (-> build dep), but
# glib's own Meson configuration uses the host pkg-config to find its
# version (-> host dep). We could technically go and fix this in glib, add
# pkg-config to depsBuildBuild, but this would be a futile exercise since
# Meson's gtkdoc integration does not support cross compilation[1] anyway
# and this derivation disables the docs build when cross compiling.
#
# [1] https://github.com/mesonbuild/meson/issues/2003
gtk-doc
];
strictDeps = true; strictDeps = true;