swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #275732 from uninsane/pr-dconf-ed-cross

Browse source 
dconf: enable cross compilation
This commit is contained in:
Rick van Schijndel 2024-02-13 16:11:07 +01:00 committed by GitHub
parent dabc3e0a03 806369ad44
commit e4a5140341
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/libraries/dconf/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, meson , meson
, mesonEmulatorHook
, ninja , ninja
, python3 , python3
, vala , vala
@ -13,16 +14,15 @@
, gtk-doc , gtk-doc
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_42 , docbook_xml_dtd_42
, withDocs ? true
}: }:
let
isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dconf"; pname = "dconf";
version = "0.40.0"; version = "0.40.0";
outputs = [ "out" "lib" "dev" ] outputs = [ "out" "lib" "dev" ]
++ lib.optional (!isCross) "devdoc"; ++ lib.optional withDocs "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";
@ -38,19 +38,23 @@ stdenv.mkDerivation rec {
glib glib
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
] ++ lib.optional (!isCross) gtk-doc; gtk-doc
] ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
mesonEmulatorHook # gtkdoc invokes the host binary to produce documentation
];
buildInputs = [ buildInputs = [
glib glib
bash-completion bash-completion
dbus dbus
] ++ lib.optional (!isCross) vala; vala
# Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. ];
mesonFlags = [ mesonFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. "-Dgtk_doc=${lib.boolToString withDocs}"
] ++ lib.optional isCross "-Dvapi=false"; ];
nativeCheckInputs = [ nativeCheckInputs = [
dbus # for dbus-daemon dbus # for dbus-daemon