diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-10 13:30:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-10 13:30:09 +0000 |
commit | 01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b (patch) | |
tree | 4839849e801f806c704c95469aed703521392e73 | |
parent | 8dc4d1187ef69dfadf50d1c8660aea7a7d347b73 (diff) | |
parent | efa57f8820e77971d3212e838eebd36c6a046c83 (diff) | |
download | nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar.gz nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar.bz2 nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar.lz nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar.xz nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.tar.zst nixlib-01e6a04ef6ec0dc12d37bfca7e9683450f1ef28b.zip |
Merge pull request #51824 from Mic92/cross-glib
glib: fix cross -> inherit devdoc from native build
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1eb50fc4f100..22acd530093e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,6 +2,7 @@ , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null +, buildPackages # this is just for tests (not in the closure of any regular package) , doCheck ? stdenv.config.doCheckByDefault or false @@ -78,12 +79,16 @@ stdenv.mkDerivation rec { utillinuxMinimal # for libmount ]; - nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales ]; + nativeBuildInputs = [ + meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales + ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; mesonFlags = [ - "-Dgtk_doc=true" + # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. + # Instead we just copy them over from the native output. + "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" ]; LC_ALL = "en_US.UTF-8"; @@ -126,6 +131,8 @@ stdenv.mkDerivation rec { # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c + '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + cp -r ${buildPackages.glib.devdoc} $devdoc ''; checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; |