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

arx-libertatis: 2019-02-16 -> 2019-07-22 #67806

Merged
merged 2 commits into from Oct 19, 2019
Merged

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Aug 31, 2019

Motivation for this change

The crash reporter needs wrapping (#65399). The package also needs its usual update before the 19.09 release.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested execution of the game
  • Tested the crash reporter is wrapped and works (by killing -11 the game)
  • Tested execution of all binary files
  • 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.

Btw, here's proof the crash reported is working:
crash

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

We shouldn't make any references to qt5, and instead use libsForQt5.callPackage in all-packages.nix and use qt's specific deriver mkDerivation. See latest qt documentation.
We also don't need to add wrapQtAppsHook to nativeBuildInputs as the deriver adds it automatically.


postInstall = ''
ln -sf \
${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
$out/share/games/arx/misc/dejavusansmono.ttf
'' + optionalString withCrashReporter ''
wrapQtApp "$out/libexec/arxcrashreporter"
Copy link
Contributor

Choose a reason for hiding this comment

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

Binaries in libexec should be automatically wrapped.
Is this a script?

Copy link
Contributor Author

@rnhmjoj rnhmjoj Oct 16, 2019

Choose a reason for hiding this comment

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

No, but I had to disable the wrapping by default since it was acting on other unrelated binaries: only the crash reporter is a Qt application.

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 16, 2019

We shouldn't make any references to qt5, and instead use libsForQt5.callPackage in all-packages.nix and use qt's specific deriver mkDerivation. See latest qt documentation.

I read the documentation but this is not a Qt application or library.
The Qt dependency is even optional so it doesn't make sense to use a specialized callPackage, imho.

@worldofpeace
Copy link
Contributor

We shouldn't make any references to qt5, and instead use libsForQt5.callPackage in all-packages.nix and use qt's specific deriver mkDerivation. See latest qt documentation.

I read the documentation but this is not a Qt application or library.
The Qt dependency is even optional so it doesn't make sense to use a specialized callPackage, imho.

I see, though the bit excluding using qts mkDerivation` still stands.

@worldofpeace
Copy link
Contributor

We need to use libsForQt5.callPackage specifically, because we need to ensure that all dependencies are built with the same version of Qt.

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 19, 2019

We need to use libsForQt5.callPackage specifically, because we need to ensure that all dependencies are built with the same version of Qt.

Ok, I understand. Is this ok, now?

@worldofpeace worldofpeace merged commit ed48341 into NixOS:master Oct 19, 2019
@worldofpeace
Copy link
Contributor

backported in 851b51f

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 20, 2019

Thank you!

@rnhmjoj rnhmjoj deleted the arx branch January 8, 2020 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants