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

winePackages.fonts: init at 4.0 #63044

Merged
merged 2 commits into from Jun 17, 2019

Conversation

Projects
None yet
5 participants
@JohnAZoidberg
Copy link
Contributor

commented Jun 12, 2019

Motivation for this change

Wine's fonts should be a natural candidate for their own subpackage

https://wiki.winehq.org/Packaging

They are a replacement for some Microsoft fonts not available in other
replacement packages, e.g. Tahoma.

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 nix-review --run "nix-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.

JohnAZoidberg added some commits Jun 12, 2019

winePackages.fonts: init at 4.0
"Wine's fonts should be a natural candidate for their own subpackage"
https://wiki.winehq.org/Packaging

They are a replacement for some Microsoft fonts not available in other
replacement packages.

@JohnAZoidberg JohnAZoidberg changed the title Wine fonts winePackages.fonts: init at 4.0 Jun 12, 2019

@ofborg ofborg bot requested review from 7c6f434c and bendlas Jun 12, 2019

@7c6f434c

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

Does the normal build of Wine also build the fonts? Should they just be an extra output?

@JohnAZoidberg

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

The fonts are included in the source and don't need building.
I didn't think about an extra output, yes that would be okay, too.
Probably better. Can I name them anyway I want? e.g. fonts.

@7c6f434c

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

Are .fon versions (that are described as needing building) completely useless?

@JohnAZoidberg

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

Yes, I think so, except for Wine.
We use .ttf in Linux. For each .ttf there is one .sfd, which are a FontForge plaintext database files. From those the "DOS compatible Bitmap fonts" (.fon) are generated.
https://wiki.winehq.org/Packaging#Fonts

@7c6f434c

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

I think it is possible to have a fonts output. If the normal build does build .FON fonts, then it seems to make sense to just install everything into an extra output.

@JohnAZoidberg

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

But then someone wanting to use just the fonts has to build wine, even if the fonts are just copied from the source. (Which takes a long time)

@nixos-discourse

This comment has been minimized.

Copy link

commented Jun 17, 2019

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/20

@FRidh

This comment has been minimized.

Copy link
Member

commented Jun 17, 2019

The overhead of performing two separate builds instead of one with an output seems to be quite small here. Considering one build is much faster compared to the other, I think it is fine to have them separated.

@7c6f434c 7c6f434c merged commit 63379e8 into NixOS:master Jun 17, 2019

15 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
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
wine, winePackages.fonts on aarch64-linux Success
Details
wine, winePackages.fonts on x86_64-linux Success
Details

@JohnAZoidberg JohnAZoidberg deleted the JohnAZoidberg:wine-fonts branch Jun 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.