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

Cemu: 2.0-92 -> 2.2 #350100

Closed
wants to merge 3 commits into from
Closed

Cemu: 2.0-92 -> 2.2 #350100

wants to merge 3 commits into from

Conversation

baduhai
Copy link
Contributor

@baduhai baduhai commented Oct 20, 2024

Things done

Updated cemu from 2.0-92 to 2.2 and changed my name in the maintainer list

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Oct 20, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 20, 2024
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines +120 to +121
majorv = builtins.elemAt tag 0;
minorv = builtins.elemAt tag 1;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
majorv = builtins.elemAt tag 0;
minorv = builtins.elemAt tag 1;
major-version = builtins.elemAt tag 0;
minor-version = builtins.elemAt tag 1;

Nit.

@azuwis
Copy link
Contributor

azuwis commented Nov 5, 2024

Build failed at current master, caused by glslang version bump d0b808a

nixpkgs-review result

Generated using nixpkgs-review.
Command: nixpkgs-review pr 350100


x86_64-linux

❌ 1 package failed to build:
  • cemu
building '/nix/store/b8npkwv2qpy35rd0jlja6l73rcx9xjvs-cemu-2.2.drv'...
error: builder for '/nix/store/b8npkwv2qpy35rd0jlja6l73rcx9xjvs-cemu-2.2.drv' failed with exit code 1;
       last 10 log lines:
       >     inlined from '_FUN' at /build/source/src/Cafe/OS/libs/nn_boss/nn_boss.cpp:1613:0:
       > /nix/store/932dj5qwfzck90mnvqpd1f9hjqznaqdj-glibc-2.40-36-dev/include/bits/string_fortified.h:59:33: warning: '__builtin_memset' writing 40 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=]
       >    59 |   return __builtin___memset_chk (__dest, __ch, __len,
       >       |                                 ^
       > In function '_FUN':
       > lto1: note: destination object is likely at address zero
       > /nix/store/pbixrqd120nnw8a0ygfpm3mnwlr1mbj7-binutils-2.43.1/bin/ld: /build/ccw7VvZr.ltrans71.ltrans.o: undefined reference to symbol '_ZN7glslang7TShader10setStringsEPKPKci'
       > /nix/store/pbixrqd120nnw8a0ygfpm3mnwlr1mbj7-binutils-2.43.1/bin/ld: /nix/store/09465jfdjm4lkddh5w1ih6q95vbmpmjh-glslang-15.0.0/lib/libglslang.so.15: error adding symbols: DSO missing from command line
       > collect2: error: ld returned 1 exit status
       > ninja: build stopped: subcommand failed.
       For full logs, run 'nix log /nix/store/b8npkwv2qpy35rd0jlja6l73rcx9xjvs-cemu-2.2.drv'.

Overriding glslang to 14.3 make cemu build again, see https://github.com/azuwis/nixpkgs/tree/push-szqvlxryoopy

@nadiaholmquist
Copy link
Contributor

The glslang issue is an easy fix without needing to downgrade the dependency.

According to glslang's README, the libraries have been consolidated into the main glslang library, but Cemu links the glslang::SPIRV target, which now provides an empty library. Seems to be a backwards-incompatible change and other things that use it should probably be checked.

You can patch src/Cafe/CMakeLists.txt to replace glslang::SPIRV with glslang::glslang and the package will build successfully.

@baduhai baduhai closed this by deleting the head repository Nov 5, 2024
@baduhai baduhai mentioned this pull request Nov 5, 2024
13 tasks
@baduhai
Copy link
Contributor Author

baduhai commented Nov 5, 2024

Continued in #353870

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants