Skip to content

alice-tools: init at 0.12.1#208433

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
OPNA2608:init/alice-tools
Feb 7, 2023
Merged

alice-tools: init at 0.12.1#208433
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
OPNA2608:init/alice-tools

Conversation

@OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Dec 31, 2022

Description of changes

Packages alice-tools, a collection of tools for viewing and converting file formats used in AliceSoft games.

image

I have checked CLI/Qt5/Qt6 variants on x86_64-linux & aarch64-linux, and CLI/Qt5 variants on x86_64-darwin. My macOS version is seemingly too old for Qt6 so trying to use those binaries just errors on my end. I have checked the builds by opening the graphics-containing archive from one of my games, browsing through its contents and extracting some of the assets into png & webp formats.

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/)
  • 23.05 Release Notes (or backporting 22.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 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 31, 2022
Comment on lines 58 to 56
Copy link
Contributor Author

Choose a reason for hiding this comment

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

With Qt5 detection works just fine:

Run-time dependency qt5 (modules: Core, Gui, Widgets) found: YES 5.15.7 (pkg-config)
Detecting Qt5 tools
Run-time dependency qt5 (modules: Core) found: YES 5.15.7 (pkg-config)
Program /nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/moc found: YES 5.15.7 (/nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/moc)
Program /nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/uic found: YES 5.15.7 (/nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/uic)
Program /nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/rcc found: YES 5.15.7 (/nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/rcc)
Program /nix/store/1dcavvraw4q6xxs2pkiwyviv2g80nqd7-qtbase-5.15.7-dev/bin/lrelease found: NO
Program lrelease5 found: NO
Program lrelease-qt5 found: NO
Program lrelease found: YES 5.15.7 (/nix/store/fs86kagqgwn6iabm13hxh0fifxgyfw6c-qttools-5.15.7-dev/bin/lrelease)

With Qt6, it doesn't:

Run-time dependency qt6 (modules: Core, Gui, Widgets) found: YES 6.4.1 (pkg-config)
Detecting Qt6 tools
Run-time dependency qt6 (modules: Core) found: YES 6.4.1 (pkg-config)
Program /nix/store/sgx4h5qca3y6qx6cpj4ssycmr5kw9vn1-qtbase-6.4.1-dev/bin/moc found: NO
Program /nix/store/j4rg2wb4z7kh7a8ciqcp20p69kr346wv-qtbase-6.4.1/./libexec/moc found: NO
Program moc6 found: NO
Program moc-qt6 found: NO
Program moc found: NO
Program /nix/store/sgx4h5qca3y6qx6cpj4ssycmr5kw9vn1-qtbase-6.4.1-dev/bin/uic found: NO
Program /nix/store/j4rg2wb4z7kh7a8ciqcp20p69kr346wv-qtbase-6.4.1/./libexec/uic found: NO
Program uic6 found: NO
Program uic-qt6 found: NO
Program uic found: NO
Program /nix/store/sgx4h5qca3y6qx6cpj4ssycmr5kw9vn1-qtbase-6.4.1-dev/bin/rcc found: NO
Program /nix/store/j4rg2wb4z7kh7a8ciqcp20p69kr346wv-qtbase-6.4.1/./libexec/rcc found: NO
Program rcc6 found: NO
Program rcc-qt6 found: NO
Program rcc found: NO
Program /nix/store/sgx4h5qca3y6qx6cpj4ssycmr5kw9vn1-qtbase-6.4.1-dev/bin/lrelease found: NO
Program /nix/store/j4rg2wb4z7kh7a8ciqcp20p69kr346wv-qtbase-6.4.1/./libexec/lrelease found: NO
Program lrelease6 found: NO
Program lrelease-qt6 found: NO
Program lrelease found: YES 6.4.1 (/nix/store/0bjv6cn2qr4lg9j13gxydi7n65qipyzf-qttools-6.4.1-dev/bin/lrelease)

src/meson.build:129:4: ERROR: MOC sources specified and couldn't find uic-qt6, please check your qt6 installation

In our Qt6 package moc, uic and rrc are in ${qtbase.dev}/libexec while in Qt5 they were in ${qtbase.dev}/bin. Meson looks in ${qtbase.dev}/bin, ${qtbase}/libexec and $PATH before giving up. Not sure if the bins are supposed to be in ${qtbase.dev}/bin or the Meson Qt6 detection needs to look in ${qtbase.dev}/libexec instead.

Copy link
Member

@lilyinstarlight lilyinstarlight Jan 10, 2023

Choose a reason for hiding this comment

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

I'm 99% sure this line https://github.com/NixOS/nixpkgs/pull/186689/files#diff-f02cbc6cb0c526605d88b8e193c234c0fba41464f0d581f5c7c3fb6c96eaf2a1R248 was supposed to have another below it for -e "/^libexecdir=/ c libexecdir=$dev/libexec" (since a few lines above it is moveToOutput libexec "$dev"). I'll submit another PR to fix sometime in the next few days

Copy link
Member

Choose a reason for hiding this comment

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

I've opened #210134 to fix this. Once this PR is merged, I'll open another PR to undo the hack in staging

Copy link
Member

Choose a reason for hiding this comment

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

(Building this PR with the hack removed but on top of that other PR does in fact build -- so yeah this seems to be the fix)

Copy link
Member

Choose a reason for hiding this comment

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

The fix for this just hit master. Can you see if it works against master without this hack now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep works fine now, will update.

Copy link
Member

Choose a reason for hiding this comment

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

Sweet, if ofborg builds then this PR looks fabulous to me so I'll approve and then see if we can get a committer to review/merge it

@OPNA2608

This comment was marked as outdated.

@OPNA2608

This comment was marked as resolved.

@OPNA2608 OPNA2608 force-pushed the init/alice-tools branch 8 times, most recently from 58e0567 to 6f4e95f Compare January 6, 2023 21:24
@OPNA2608 OPNA2608 changed the title alice-tools: init at 0.12.0 alice-tools: init at 0.12.1 Jan 8, 2023
@OPNA2608 OPNA2608 force-pushed the init/alice-tools branch 3 times, most recently from 86c581a to 1b2c2c1 Compare January 9, 2023 22:14
Copy link
Member

@lilyinstarlight lilyinstarlight left a comment

Choose a reason for hiding this comment

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

Aside from the one nit and the one mentioned Qt issue (which is something that needs to be fixed for Qt's pkg-config files in a separate PR), this looks fabulous to me

@OPNA2608 OPNA2608 force-pushed the init/alice-tools branch 2 times, most recently from dbc7d29 to c17d4ac Compare January 10, 2023 23:51
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/822

@mweinelt mweinelt added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 5, 2023
@SuperSandro2000 SuperSandro2000 merged commit 935e195 into NixOS:master Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants