Commit Graph

164 Commits

Author SHA1 Message Date
R. Ryantm
9508ddad2b fontconfig: 2.18.1 -> 2.18.2 2026-07-11 09:57:44 +00:00
Sandro
035c289c20 {libtiff, fontconfig}: add missing libraries to propagatedBuildInputs (#527320) 2026-06-24 16:34:31 +00:00
Artemis Tosini
ce5d29c0b7 fontconfig: Fix cross building
The fontconfig autotools build attempts to check for va_copy with a
test program. This doesn't work cross, but we can hardcode the result.

It may be best to use meson in the future.
2026-06-22 16:48:49 -04:00
R. Ryantm
a630049d80 fontconfig: 2.17.1 -> 2.18.1 2026-06-06 03:40:44 +00:00
Ross Smyth
55d225453e fontconfig: add expat to propagatedBuildInputs
This is listed in the pkg-config Requires, so it is needed.
2026-06-02 18:20:09 -04:00
Rick van Schijndel
8837ff89ee fontconfig: fix make-fonts-cache for structuredAttrs (#474148) 2025-12-30 19:30:51 +00:00
Stefan Frijters
bc88417ed5 fontconfig: fix make-fonts-cache for structuredAttrs 2025-12-25 17:41:08 +01:00
Wolfgang Walther
46c0c0eae7 Merge branch 'staging-next' into staging 2025-12-10 18:42:31 +01:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
Jonathan Davies
116036d574 treewide: Remove redundant versionCheckProgramArg = "--version"; with:
```shell
git grep -l -e 'versionCheckProgramArg = "--version";' -e 'versionCheckProgramArg = \[ "--version" \];' | while read f; do
  sed -i '/versionCheckProgramArg/d' "$f"
  sed -i '/^$/N;/\n$/D' "$f"
done
```
2025-11-20 10:39:02 +00:00
misilelab
027094de97 fontconfig: 2.16.2 -> 2.17.1
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.16.2...2.17.1

Signed-off-by: misilelab <misileminecord@gmail.com>
2025-09-06 21:12:42 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Jan Tojnar
5f4cf3d8e0 Merge fontconfig: 2.16.0 -> 2.16.2 (#401037) 2025-06-07 18:23:28 +02:00
K900
f96ac2dcd6 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-26 09:07:48 +03:00
Fernando Rodrigues
05580f4b44 treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
Follow-up to #394797.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2025-04-25 22:20:17 -03:00
Kenichi Kamiya
f80a788128 fontconfig: add man pages checks 2025-04-23 17:59:32 +09:00
Kenichi Kamiya
b3bb63f441 fontconfig: use tarball for src to include man pages
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2025-04-23 17:59:24 +09:00
Kenichi Kamiya
873eb8eafe fontconfig: 2.16.0 -> 2.16.2
Diff: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.16.0...2.16.2
2025-04-23 17:22:23 +09:00
Kenichi Kamiya
227188afb0 fontconfig: add versionCheckHook 2025-04-23 17:22:22 +09:00
Kenichi Kamiya
ad4e04502c fontconfig: add updateScript 2025-04-23 17:22:22 +09:00
Kenichi Kamiya
4bb08abe14 fontconfig: prefer GitLab for src
https://www.freedesktop.org/software/fontconfig/release/ does not include latest releases
such as 2.16.{1,2}.

They use GitLab and the releases since 2.16.1.
It was announced in https://lists.freedesktop.org/archives/fontconfig/2025-March/007154.html.

This change requires to remove unpackaged man pages.
2025-04-23 17:22:05 +09:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
Colin
e021ee13f9 makeFontsCache: fix cross compilation
lifting the `callPackage` to scope level ensures splicing works as expected.
we still need to emulate fc-cache to produce usable cache entries though.
2025-03-19 07:49:19 +00:00
misilelab
e64988cb66 fontconfig: 2.15.0 -> 2.16.0
Signed-off-by: misilelab <misileminecord@gmail.com>
2025-01-31 01:32:48 +09:00
Silvan Mosberger
667d42c00d treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
K900
9729387a99 fontconfig: fix properly, remove NixOS module hack
This reverts 49d33d4a6b.
2024-08-30 10:16:01 +03:00
Matthieu C.
c55536c53c makeFontsConf: accept 'includes'
Lets you add pure font configuration without having to copy/paste the
whole generated config.
2024-08-07 15:11:09 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Matthieu Coudron
912d84a6d8 makeFontsConf: refactor for readibility (#299220)
* makeFontsConf: refactor for readibility

and to ease the possibility to override impureFontsDirectories
2024-04-03 13:23:33 +02:00
Rodney Lorrimar
6b3baaf8d6 fontconfig: Add meta.pkgConfigModules 2024-02-22 13:57:41 +08:00
Vincenzo Mantova
9de711cf62 makeFontsConf: add impureFontDirectories argument 2024-01-15 10:53:43 +01:00
Jan Tojnar
507113361f fontconfig: 2.14.2 → 2.15.0
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.14.2...2.15.0
2024-01-02 17:24:31 +01:00
R. Ryantm
0d6a6827ea fontconfig: 2.14.0 → 2.14.2
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.14.0...2.14.2

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-03 16:02:22 +02:00
Vincenzo Mantova
0949f3cd78 makeFontsConf: add darwin system fonts (#228619) 2023-04-28 15:24:38 -04:00
Jan Tojnar
6dd69475e2 fontconfig: 2.13.94 → 2.14.0
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.13.94...2.14.0
2022-06-09 21:21:04 +02:00
Erik Arvstedt
9e0a35863a fontconfig: add upstream patch to fix font style detection 2021-12-09 14:32:35 +01:00
André Silva
824c83d7ce fontconfig: 2.13.93 -> 2.13.94 2021-07-08 23:53:26 +01:00
Alyssa Ross
9852c9e5b6 fontconfig: 2.13.92 -> 2.13.93
All the patches we had before are now included upstream.
2021-06-17 19:11:15 +00:00
Andrew Childs
c9af80e44a fontconfig: backport atomics fixes for aarch64-darwin 2021-05-17 00:27:00 +09:00
Vladimír Čunát
07773b36da fontconfig: adopt by the freedesktop team 2021-05-07 16:28:41 +02:00
Vladimír Čunát
9a650af266 treewide maintainers: remove myself from a few places
It will better reflect the reality of the past few years.
2021-05-07 16:07:38 +02:00
hannesweisbach
869b1090b8 fontconfig: Add CoreFoundation to buildInputs (#98379)
Get rid of non-absolute RPATH reference to CoreFoundation
2021-03-21 18:28:11 -04:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Justin Humm
6463b27df9 fontconfig: build manpages, install them in bin output
We exclude man3, as it is pretty large and probably not so relevant.
2020-11-18 15:45:37 +01:00
Jan Tojnar
4f0f26771e Merge pull request #95358 from jtojnar/global-fontconfig 2020-09-05 00:19:38 +02:00
Jan Tojnar
6f96063804 makeFontsConf: clean up
The use of the argument was removed in 2016 but its definition was left behind.

cd2948a72e
2020-09-03 09:42:58 +02:00
Jan Tojnar
6dd3b54ccc treewide: use URN for fontconfig DTD
To match upstream change:

9c46ef4aac
2020-09-03 06:39:00 +02:00
Jan Tojnar
b49a769970 fontconfig: get rid of rest of versioned configs
The incompatibility does not seem to exist any more: programs linked against fc 2.12
on fc 2.14 system seem to at least display text, even while printing tons of errors
(as long as you generate fc cache manually), and same thing the other way around.
Hopefully it will not be an issue in the future.
2020-08-29 19:16:22 +02:00
Jan Tojnar
89401d986c Revert "fontconfig: Only read versioned config dirs"
This reverts commit edf2541f02.

Turns out lot of software (including Chromium) use bundled fontconfig
so we either need to wrap every one of those, or re-introduce the global
unversioned config. The latter is easier but weakens hermetic configs.

But perhaps those are not really worth the effort. Given that programs
linked against fc 2.12.6 on fc 2.13.92 system seem to at least display text,
even while printing tons of errors (as long as you generate fc cache manually),
and same thing the other way around, hopefully it will not be an issue in the future.

We give up on the hermetic configs in exchange for getting rid of lot of complexity.
2020-08-29 19:15:36 +02:00