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

Merge pull request #117914 from Mindavi/cross/gtk-doc-json-glib 

gtk-doc + json-glib: fix cross-compilation
This commit is contained in:
John Ericson 2021-04-15 16:39:02 -04:00 committed by GitHub
parent 93d0f1c237 8e14bce571
commit 38c8ae9bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/json-glib/default.nix
View File

@ -6,6 +6,7 @@
, ninja , ninja
, pkg-config , pkg-config
, gettext , gettext
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, gobject-introspection , gobject-introspection
, fixDarwinDylibNames , fixDarwinDylibNames
, gtk-doc , gtk-doc
@ -18,31 +19,45 @@ stdenv.mkDerivation rec {
pname = "json-glib"; pname = "json-glib";
version = "1.6.2"; version = "1.6.2";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" ]
++ lib.optional withIntrospection "devdoc";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3";
}; };
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pkg-config pkg-config
gettext gettext
gobject-introspection
glib glib
gtk-doc
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
] ++ lib.optional stdenv.hostPlatform.isDarwin [ ] ++ lib.optional stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames fixDarwinDylibNames
] ++ lib.optionals withIntrospection [
gobject-introspection
gtk-doc
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
glib glib
]; ];
mesonFlags = lib.optionals (!withIntrospection) [
"-Dintrospection=disabled"
# doc gen uses introspection, doesn't work properly
"-Dgtk_doc=disabled"
];
doCheck = true; doCheck = true;
passthru = { passthru = {

7
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@ -32,6 +32,13 @@ python3.pkgs.buildPythonApplication rec {
passthru.respect_xml_catalog_files_var_patch passthru.respect_xml_catalog_files_var_patch
]; ];
strictDeps = true;
depsBuildBuild = [
python3
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
gettext gettext