Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9451ae5974fe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6463b27df9d8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2020

  1. fontconfig: build manpages, install them in bin output 

    We exclude man3, as it is pretty large and probably not so relevant.
    @erictapen @FRidh
    erictapen authored and FRidh committed Nov 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6463b27 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/libraries/fontconfig/default.nix
4 changes: 3 additions & 1 deletion pkgs/development/libraries/fontconfig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
"--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
"--disable-docs"
# just <1MB; this is what you get when loading config fails for some reason
"--with-default-fonts=${dejavu_fonts.minimal}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -108,6 +107,9 @@ stdenv.mkDerivation rec {
${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
> fonts.conf.tmp
mv fonts.conf.tmp $out/etc/fonts/fonts.conf
# We don't keep section 3 of the manpages, as they are quite large and
# probably not so useful.
rm -r $bin/share/man/man3
'';

meta = with stdenv.lib; {