Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16cf68dc7acd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3050545e41b7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 28, 2020

  1. dconf: fix cross compilation 

    Vala doesn't yet cross-compile, and gtk-doc uses some
gobject-introspection bits (and gobject-introspection doesn't
cross-compile either).
    @flokli
    flokli committed Dec 28, 2020
    Copy the full SHA
    e69bc44 View commit details

  2. dconf: remove libxml2 

    This doesn't seem to be required anymore (?)
    @flokli
    flokli committed Dec 28, 2020
    Copy the full SHA
    195bb48 View commit details

Commits on Jan 1, 2021

  1. Merge pull request #107808 from flokli/dconf-fix-cross 

    dconf: fix cross compilation
    @flokli
    flokli authored Jan 1, 2021
    Copy the full SHA
    3050545 View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/development/libraries/dconf/default.nix
20 changes: 10 additions & 10 deletions pkgs/development/libraries/dconf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,17 +10,19 @@
, bash-completion
, dbus
, gnome3
, libxml2
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_42
}:

let
isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
in
stdenv.mkDerivation rec {
pname = "dconf";
version = "0.38.0";

outputs = [ "out" "lib" "dev" "devdoc" ];
outputs = [ "out" "lib" "dev" ]
++ stdenv.lib.optional (!isCross) "devdoc";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -30,27 +32,25 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
vala
pkg-config
python3
libxslt
libxml2
glib
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_42
];
] ++ stdenv.lib.optional (!isCross) gtk-doc;

buildInputs = [
glib
bash-completion
dbus
];
] ++ stdenv.lib.optional (!isCross) vala;
# Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling.

mesonFlags = [
"--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;