diff options
| author | Artturin <Artturin@artturin.com> | 2022-07-07 21:34:37 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-07-08 03:56:47 +0300 |
| commit | 1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc (patch) | |
| tree | 642b83508642481cce786f93793d57f65491f9cf /pkgs/development/libraries/harfbuzz | |
| parent | bf15263d1c87f64a86828786b54455fa1210036d (diff) | |
various: enable gobject-introspection when cross-compiling
and fix cross in some
Diffstat (limited to 'pkgs/development/libraries/harfbuzz')
| -rw-r--r-- | pkgs/development/libraries/harfbuzz/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index b7ba05bb79b5a..49dba7c65804e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -34,7 +34,6 @@ 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 { @@ -70,7 +69,10 @@ stdenv.mkDerivation { (mesonFeatureFlag "coretext" withCoreText) (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) - (mesonFeatureFlag "introspection" isNativeCompilation) + ]; + + depsBuildBuild = [ + pkg-config ]; nativeBuildInputs = [ @@ -86,8 +88,7 @@ stdenv.mkDerivation { ]; buildInputs = [ glib freetype ] - ++ lib.optionals withCoreText [ ApplicationServices CoreText ] - ++ lib.optionals isNativeCompilation [ gobject-introspection ]; + ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; |