Skip to content

Comments

nixos/fontconfig: fix 50-user.conf handling#95716

Merged
flokli merged 1 commit intoNixOS:masterfrom
flokli:fontconfig-fix-50-user.conf
Aug 17, 2020
Merged

nixos/fontconfig: fix 50-user.conf handling#95716
flokli merged 1 commit intoNixOS:masterfrom
flokli:fontconfig-fix-50-user.conf

Conversation

@flokli
Copy link
Member

@flokli flokli commented Aug 17, 2020

Apparently, edf2541 was missed while
rebasing #93562.

Provide 50-user.conf in fontconfig if includeUserConf is true (the
default), and don't try removing the non-existent one if it's disabled

Fixes #95685
Fixes #95712

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
nixos/fontconfig: fix 50-user.conf handling
8425726 
Apparently, edf2541 was missed while
rebasing NixOS#93562.

Provide 50-user.conf in fontconfig if includeUserConf is true (the
default), and don't try removing the non-existent one if it's disabled

Fixes NixOS#95685
Fixes NixOS#95712
@flokli flokli requested review from DIzFer, jtojnar and pbogdan August 17, 2020 21:15
This was referenced Aug 17, 2020
Closed
Closed
Merged
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 17, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 17, 2020
@flokli flokli merged commit 8c065b2 into NixOS:master Aug 17, 2020
@flokli flokli deleted the fontconfig-fix-50-user.conf branch August 17, 2020 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar jtojnar approved these changes

@pbogdan pbogdan Awaiting requested review from pbogdan

@DIzFer DIzFer Awaiting requested review from DIzFer

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

50-user.conf fontconfig file no longer generated builder for fontconfig-conf fails on unstable

2 participants

@flokli @jtojnar