Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fontconfig: fix cross make-fonts-cache & make-fonts-config #51601

Merged
merged 1 commit into from Dec 7, 2018

Conversation

@eburimu
Copy link
Contributor

eburimu commented Dec 6, 2018

Motivation for this change

Fxs binary dependencies during cross compilation.
Fixes: #51563

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 merged commit 12f4e08 into NixOS:staging Dec 7, 2018
9 checks passed
9 checks passed
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 7, 2018

Sorry I had to revert this again: 4f87d7e
Using buildPackages make this function ignoring its fontconfig argument, which defeats the point of the function. This needs a different solution.

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 7, 2018

A better fix could be passing the right argument in nixos/modules/config/fonts/fontconfig-penultimate.nix and nixos/modules/config/fonts/fontconfig.nix.

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 7, 2018

cc @ttuegel the maintainer of penultimate that made this function necessary.

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 7, 2018

@ttuegel does the fontconfig binary needs to be passed from the module at all?
Would it not be enough, if we set a version in the default.nix function?

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 7, 2018

I also find it questionable that these functions are in all-packages as this is part of nixos.

@ttuegel

This comment has been minimized.

Copy link
Member

ttuegel commented Dec 8, 2018

@ttuegel does the fontconfig binary needs to be passed from the module at all?
Would it not be enough, if we set a version in the default.nix function?

I don't understand what you mean, but

A better fix could be passing the right argument in nixos/modules/config/fonts/fontconfig-penultimate.nix and nixos/modules/config/fonts/fontconfig.nix.

Passing in fontconfig = buildPackages.fontconfig from the NixOS module sounds like a solution to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.