diff options
| author | Florian Klink <flokli@flokli.de> | 2021-01-01 21:09:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 21:09:35 +0100 |
| commit | 3050545e41b71b0be996b634b27d3a519f3b8b13 (patch) | |
| tree | f71a5f89b9f99c4bde8f4f383d6f9dfd137e122d /pkgs | |
| parent | 16cf68dc7acd1503cb43cb28897143c4c26c21d0 (diff) | |
| parent | 195bb483dd1bb33dbfd223bd084869a82b4b2831 (diff) | |
| download | nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar.gz nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar.bz2 nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar.lz nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar.xz nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.tar.zst nixpkgs-3050545e41b71b0be996b634b27d3a519f3b8b13.zip | |
Merge pull request #107808 from flokli/dconf-fix-cross
dconf: fix cross compilation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/dconf/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index c9c1b9be922..4b574a17f78 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -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; |