diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/pango | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pango')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/pango/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index 513bfe2d17e6..c298ca8c17da 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -6,7 +6,6 @@ , harfbuzz , libintl , libthai -, gobject-introspection , darwin , fribidi , gnome @@ -16,12 +15,13 @@ , meson , ninja , glib +, python3 , x11Support? !stdenv.isDarwin, libXft +, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) +, gobject-introspection +, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) }: -let - withDocs = stdenv.buildPlatform == stdenv.hostPlatform; -in stdenv.mkDerivation rec { pname = "pango"; version = "1.48.10"; @@ -34,12 +34,21 @@ stdenv.mkDerivation rec { sha256 = "IeH1eYvN/adeq8QoBRSwiWq1b2VtTn5mAwuaJTXs3Jg="; }; + strictDeps = !withIntrospection; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja glib # for glib-mkenum pkg-config + ] ++ lib.optionals withIntrospection [ gobject-introspection + ] ++ lib.optionals withDocs [ gi-docgen + python3 ]; buildInputs = [ @@ -63,10 +72,9 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${lib.boolToString withDocs}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file |