Skip to content

gtk-doc + json-glib: fix cross-compilation #117914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 2 commits into from
Apr 15, 2021
Merged

gtk-doc + json-glib: fix cross-compilation #117914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9647bb3
gtk-doc: fix cross-compilation
Mindavi Mar 19, 2021
8e14bce
json-glib: fix cross-compilation by disabling introspection and docs
Mindavi Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions pkgs/development/libraries/json-glib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, ninja
, pkg-config
, gettext
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, gobject-introspection
, fixDarwinDylibNames
, gtk-doc
Expand All @@ -18,31 +19,45 @@ stdenv.mkDerivation rec {
pname = "json-glib";
version = "1.6.2";

outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" ]
++ lib.optional withIntrospection "devdoc";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3";
};

strictDeps = true;

depsBuildBuild = [
pkg-config
];

nativeBuildInputs = [
meson
ninja
pkg-config
gettext
gobject-introspection
glib
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
] ++ lib.optional stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
] ++ lib.optionals withIntrospection [
gobject-introspection
gtk-doc
];

propagatedBuildInputs = [
glib
];

mesonFlags = lib.optionals (!withIntrospection) [
"-Dintrospection=disabled"
# doc gen uses introspection, doesn't work properly
"-Dgtk_doc=disabled"
];

doCheck = true;

passthru = {
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/tools/documentation/gtk-doc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ python3.pkgs.buildPythonApplication rec {
passthru.respect_xml_catalog_files_var_patch
];

strictDeps = true;

depsBuildBuild = [
python3
pkg-config
];

nativeBuildInputs = [
pkg-config
gettext
Expand Down