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.

Sign up for GitHub

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

Jump to bottom

xkcd-font: fix build #174776

Merged
merged 3 commits into from
May 27, 2022
Merged

xkcd-font: fix build #174776

merged 3 commits into from
May 27, 2022

Conversation

midchildan
Copy link
Member

@midchildan midchildan commented May 26, 2022 •
edited
Loading

Description of changes

ZHF: #172160
ping @NixOS/nixos-release-managers

The current package tries to override the postFetch phase in fetchzip, but that no longer works after #173430.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@midchildan midchildan added the 0.kind: build failure A package fails to build label May 26, 2022
@ofborg ofborg bot requested a review from marsam May 26, 2022 18:21
@SuperSandro2000 SuperSandro2000 merged commit dbd004e into NixOS:master May 27, 2022
@github-actions github-actions bot mentioned this pull request May 27, 2022
Merged
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #175043 for release-22.05.

@midchildan midchildan deleted the fix/xkcd-font branch May 28, 2022 13:58
Artturin
Artturin reviewed May 30, 2022
View reviewed changes
pkgs/data/fonts/xkcd-font/default.nix
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf

# remove unrelated files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I came up with a shorter way of doing this https://github.com/NixOS/nixpkgs/pull/175381/files#diff-065071edaa386151863b7c71f585da7d8d1d15f9bd21a65a9f1cbb4ccdcde26aR13

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Artturin If you don't mind, could you include it in your PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Artturin Artturin Artturin left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@marsam marsam Awaiting requested review from marsam

Assignees
No one assigned
Labels
0.kind: build failure A package fails to build 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@midchildan @SuperSandro2000 @Artturin