diff options
| author | Rick van Schijndel <rol3517@gmail.com> | 2021-11-21 17:10:11 +0100 |
|---|---|---|
| committer | Rick van Schijndel <rol3517@gmail.com> | 2021-11-25 22:02:34 +0100 |
| commit | 35f13295c40b8a8e51d8980c6f8ae17bb1855c83 (patch) | |
| tree | 9a85648058d1ff4cd9d812e9903dc744186cfe54 | |
| parent | 1debd0c7540957969626394e3aae19cc8f99eef8 (diff) | |
| download | nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar.gz nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar.bz2 nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar.lz nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar.xz nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.tar.zst nixpkgs-35f13295c40b8a8e51d8980c6f8ae17bb1855c83.zip | |
libxklavier: support cross-compilation
| -rw-r--r-- | pkgs/development/libraries/libxklavier/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index b3b87e46b72..cdce45e11fe 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl -, glib, isocodes, gobject-introspection }: +, glib, isocodes, gobject-introspection +, withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) +}: stdenv.mkDerivation rec { pname = "libxklavier"; @@ -13,14 +15,12 @@ stdenv.mkDerivation rec { patches = [ ./honor-XKB_CONFIG_ROOT.patch ]; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optionals withDoc [ "devdoc" ]; # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ]; - - buildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl gobject-introspection ]; preAutoreconf = '' export NOCONFIGURE=1 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--disable-xmodmap-support" - "--enable-gtk-doc" + "${if withDoc then "--enable-gtk-doc" else "--disable-gtk-doc"}" ]; meta = with lib; { |