diff options
author | Rick van Schijndel <rol3517@gmail.com> | 2021-05-25 21:13:24 +0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-05-31 16:25:33 +0200 |
commit | 3e6f510ca2b80a3c1563e5a80225bb81efde8ed5 (patch) | |
tree | 3e0c7ab440f86bd15bba03e5372f75bf21103214 | |
parent | 2c55b0313832a4763a09a55a35095b37c9d84c5b (diff) | |
download | nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar.gz nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar.bz2 nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar.lz nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar.xz nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.tar.zst nixpkgs-3e6f510ca2b80a3c1563e5a80225bb81efde8ed5.zip |
harfbuzz: support cross-compilation by disabling introspection
See also discussion about this in the WIP PR from @Ericson2314: - https://github.com/NixOS/nixpkgs/pull/88222 Related issue: - https://github.com/NixOS/nixpkgs/issues/72868
-rw-r--r-- | pkgs/development/libraries/harfbuzz/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index ed582248dfe..7376611e1db 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -28,6 +28,7 @@ let inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + isNativeCompilation = stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { @@ -56,6 +57,7 @@ stdenv.mkDerivation { (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) (mesonFeatureFlag "coretext" withCoreText) + (mesonFeatureFlag "introspection" isNativeCompilation) ]; nativeBuildInputs = [ @@ -71,7 +73,8 @@ stdenv.mkDerivation { ]; buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; + ++ lib.optionals withCoreText [ ApplicationServices CoreText ] + ++ lib.optionals isNativeCompilation [ gobject-introspection ]; propagatedBuildInputs = optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; |