diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 12:01:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-04 12:01:06 +0000 |
commit | a6fdcf8d5293f99ed9484354b3eed7320744a62c (patch) | |
tree | 03e1d45961bc4d1c24645c20b10027355e21f67f /pkgs/development/libraries/pango | |
parent | 89ee82a6e9e46e3394e6e87e30f9fd46b0b7947e (diff) | |
parent | 4849dec4e93a9ee51d285b760a6fda4272e78483 (diff) | |
download | nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar.gz nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar.bz2 nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar.lz nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar.xz nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.tar.zst nixpkgs-a6fdcf8d5293f99ed9484354b3eed7320744a62c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/pango')
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 98a97e65a6f..c75e33a0686 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,11 +19,15 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; version = "1.48.5"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -58,9 +62,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString withDocs}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file @@ -70,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = '' + postInstall = lib.optionalString withDocs '' # So that devhelp can find this. # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 mkdir -p "$devdoc/share/devhelp" |