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

rpcs3: 0.0.8-9300-341fdf7eb -> 0.0.10-10310-7df825855 #90130

Closed
wants to merge 1 commit into from
Closed

rpcs3: 0.0.8-9300-341fdf7eb -> 0.0.10-10310-7df825855 #90130

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented Jun 11, 2020 •
edited by ghost

Requires #84232

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from abbradar June 11, 2020 10:47
@kolbycrouch
Copy link

Doesn't this depend on qt 5.14?

ghost
ghost suggested changes Jun 29, 2020
View reviewed changes
Copy link

@ghost ghost left a comment •
edited by ghost

Choose a reason for hiding this comment

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

I just tried compiling the package, but it throws an error about the 'RPCS3_GIT_FULL_BRANCH' variable not being set.
This can be fixed by adding it to preConfigure, like this:

   preConfigure = ''
     cat > ./rpcs3/git-version.h <<EOF
     #define RPCS3_GIT_VERSION "${gitVersion}"
     #define RPCS3_GIT_BRANCH "HEAD"
+    #define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"
     #define RPCS3_GIT_VERSION_NO_UPDATE 1
     EOF
   '';

Setting any other value for RPCS3_GIT_FULL_BRANCH makes it compile just fine, but it throws a warning about it being an unofficial build everytime it is started.

@Mic92 Mic92 marked this pull request as draft June 29, 2020 19:45
@Mic92
Copy link
Member

Mic92 commented Jun 29, 2020

Mark as draft until we have #84232

@ghost
Copy link
Author

ghost commented Dec 13, 2020

close in favor of #100773

@ghost ghost closed this Dec 13, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
2.status: merge conflict 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kolbycrouch @Mic92 @ryantm