Skip to content

linthesia: init at 0.8.0#157455

Merged
vcunat merged 2 commits intoNixOS:masterfrom
ckiee:linthesia
Feb 8, 2022
Merged

linthesia: init at 0.8.0#157455
vcunat merged 2 commits intoNixOS:masterfrom
ckiee:linthesia

Conversation

@ckiee
Copy link
Member

@ckiee ckiee commented Jan 30, 2022 •
edited
Loading

Motivation for this change

Playing piano better!

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.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 30, 2022
vcunat
vcunat reviewed Feb 6, 2022
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

I'm not sure if it's just me, but rendered text looks like unreadable noise instead.

@ckiee
Copy link
Member Author

ckiee commented Feb 7, 2022

I'm not sure if it's just me, but rendered text looks like unreadable noise instead.

A screenshot showing two windows, on the left a terminal emulator running ./result/bin/linthesia and on the right the linthesia program running, showing a list of folders: favorites, game_themes, hannon, keyboard_classics, learning, popular.

(as for the review comments) Here I was thinking I could get away with a perfect PR this time around, but alas; fixed it now :P

[Now for the obligatory ping in case GitHub decides sending notifications is bad: @vcunat]

@ckiee ckiee changed the title linthesia: init at unstable-2022-01-31 linthesia: init at 0.8.0 Feb 7, 2022
@vcunat
Copy link
Member

vcunat commented Feb 7, 2022 •
edited
Loading

It shows OK on your commit, but when I merge that to current nixpkgs master I get
linthesia-noise

@vcunat
Copy link
Member

vcunat commented Feb 7, 2022

I wonder if this log is related to the noise:

(process:2388069): GLib-GObject-CRITICAL **: 09:11:42.214: g_object_set_qdata_full: assertion 'quark > 0' failed

Anyway, I suggest you try the commit atop current nixpkgs master as well.

ckiee added 2 commits February 7, 2022 19:09
@ckiee
SDL2_ttf_2_0_15: init
1c583d8 
This is an older version of the SDL2_ttf derivation needed for
`linthesia` to run properly. I don't know why a minor version change
broke things (2.0.15 -> 2.0.18) but it did and this fixes that without
disrupting other packages.
@ckiee
linthesia: init at 0.8.0
202f13c
@ckiee
Copy link
Member Author

ckiee commented Feb 7, 2022

Anyway, I suggest you try the commit atop current nixpkgs master as well.

Rebasing reproduced your screenshot instantly and the culprit appears to be #154827 as reverting that commit fixes it, haven't pushed the revert since I can't reproduce this issue on any other dependants of SDL2_ttf.

@vcunat vcunat mentioned this pull request Feb 7, 2022
Merged
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Feb 7, 2022
vcunat
vcunat approved these changes Feb 7, 2022
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

OK, assuming it work well for you overall.

@ckiee
Copy link
Member Author

ckiee commented Feb 7, 2022

A screenshot practically identical to the previous one in this PR

Merge, pretty please?

@McSinyx
Copy link
Member

McSinyx commented Feb 7, 2022

Have you contacted upstream about compatibility with SDL_ttf 2.0.18? Unless it is NixOS-specific problem with its integration, I don't think rushing inclusion of linthesia with SDL_ttf 2.0.15 is the right thing to do here and linthesia should be fixed instead.

@ckiee
Copy link
Member Author

ckiee commented Feb 7, 2022

(@McSinyx)

Have you contacted upstream about compatibility with SDL_ttf 2.0.18?

Nope.

Unless it is NixOS-specific problem with its integration, I don't think rushing inclusion of linthesia with SDL_ttf 2.0.15 is the right thing to do here and linthesia should be fixed instead.

It's not perfect but it is functional and pretty easily removed once upstream figures their stuff out. I'm not in the mood to start recursing into this problem much since I'm like halfway-burnt-out and we do this kind of thing in nixpkgs a lot already.

Waiting until code is perfect is not a viable approach for large projects like this where PRs that are open for a while inevitably start getting conflicts, missing out on treewide changes, etc. Dependencies do make major changes in minor bumps and we just have to deal with that as downstream consumers.

@ckiee ckiee mentioned this pull request Feb 7, 2022
Closed
@vcunat vcunat merged commit 3aec184 into NixOS:master Feb 8, 2022
@vcunat
Copy link
Member

vcunat commented Feb 8, 2022

I believe it's OK to merge this makeshift solution.

SuperSandro2000
SuperSandro2000 reviewed Feb 8, 2022
View reviewed changes
pkgs/development/libraries/SDL2_ttf/2.0.15.nix
nativeBuildInputs = [ pkg-config ];

buildInputs = [ SDL2 freetype libGL ]
++ lib.optional stdenv.isDarwin darwin.libobjc;
Copy link
Member

@SuperSandro2000 SuperSandro2000 Feb 8, 2022

Choose a reason for hiding this comment

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

darwin shouldn't be used as an input like pkgs.

Copy link
Member

@vcunat vcunat Feb 8, 2022

Choose a reason for hiding this comment

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

I agree, but that's a problem in the SDL2_ttf expressions, in both versions. Not really in this PR.

@ckiee ckiee mentioned this pull request Apr 30, 2022
Merged
2 tasks
@ckiee ckiee mentioned this pull request May 19, 2022
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat vcunat approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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.

4 participants

@ckiee @vcunat @McSinyx @SuperSandro2000