diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
| commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
| tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/development/libraries/pango | |
| parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
| parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
| download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip | |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pango')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pango/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index f4dba00d3518..c75e33a0686e 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -19,15 +19,19 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.4"; + 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"; - sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; + sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; }; nativeBuildInputs = [ @@ -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" |