diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
| commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
| tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/dconf | |
| parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
| parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
| download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dconf')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/dconf/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dconf/default.nix b/nixpkgs/pkgs/development/libraries/dconf/default.nix index 1516e9caef09..2f8ea0e685e8 100644 --- a/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl , meson +, mesonEmulatorHook , ninja , python3 , vala @@ -13,16 +14,15 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 +, withDocs ? true }: -let - isCross = (stdenv.hostPlatform != stdenv.buildPlatform); -in + stdenv.mkDerivation rec { pname = "dconf"; version = "0.40.0"; outputs = [ "out" "lib" "dev" ] - ++ lib.optional (!isCross) "devdoc"; + ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -38,19 +38,23 @@ stdenv.mkDerivation rec { glib docbook-xsl-nons 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 = [ glib bash-completion dbus - ] ++ lib.optional (!isCross) vala; - # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. + vala + ]; mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. - ] ++ lib.optional isCross "-Dvapi=false"; + "-Dgtk_doc=${lib.boolToString withDocs}" + ]; nativeCheckInputs = [ dbus # for dbus-daemon |