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

dconf: fix cross compilation

Browse Source 
Vala doesn't yet cross-compile, and gtk-doc uses some
gobject-introspection bits (and gobject-introspection doesn't
cross-compile either).
This commit is contained in:
Florian Klink 2020-12-28 16:45:00 +01:00
parent 093632af9e
commit e69bc44dc7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/dconf/default.nix
View File

@ -15,12 +15,15 @@
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_42 , docbook_xml_dtd_42
}: }:
let
isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dconf"; pname = "dconf";
version = "0.38.0"; version = "0.38.0";
outputs = [ "out" "lib" "dev" "devdoc" ]; outputs = [ "out" "lib" "dev" ]
++ stdenv.lib.optional (!isCross) "devdoc";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@ -30,27 +33,26 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
vala
pkg-config pkg-config
python3 python3
libxslt libxslt
libxml2 libxml2
glib glib
gtk-doc
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
]; ] ++ stdenv.lib.optional (!isCross) gtk-doc;
buildInputs = [ buildInputs = [
glib glib
bash-completion bash-completion
dbus dbus
]; ] ++ stdenv.lib.optional (!isCross) vala;
# Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling.
mesonFlags = [ mesonFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"-Dgtk_doc=true" "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
]; ] ++ stdenv.lib.optional isCross "-Dvapi=false";
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;