qt5, plasma-5: Make 'bin' output the first one #29827
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dezgeg
added
the
9.needs: port to stable
ttuegel
requested changes
Sep 27, 2017
pkgs/games/qgo/default.nix
Outdated
| @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { | |||
| # libQt5XcbQpa is a platform plugin dependency and doesn't get linked | |||
| patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo | |||
| wrapProgram $out/bin/qgo \ | |||
| --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/" | |||
| --set QT_QPA_PLATFORM_PLUGIN_PATH "${stdenv.lib.getLib qt56.qtbase}/lib/qt-5.6/plugins/platforms/" | |||
There was a problem hiding this comment.
This should be ${stdenv.lib.getBin qt56.qtbase}/$qtPluginPrefix/platforms/. The plugins are installed in bin because they are not exactly libraries and they need to be installed alongside any executables anyway.
There was a problem hiding this comment.
Thanks, fixed & amended.
dezgeg
force-pushed
the
qt5-shuffle-outputs
branch
from
4bda409
to
06ead43
Compare
|
Qt 5.6 already has Out of: These failed to build: ...which are probably existing failures in master. |
|
Yes, those are pre-existing failures, given that before my commits nix wants to download everything from the binary cache except: |
|
Does this sound fine now? |
Stay consistent with other multiple output packages.
Builds fine without.
dezgeg
force-pushed
the
qt5-shuffle-outputs
branch
from
06ead43
to
22bb26c
Compare
samueldr
removed
the
9.needs: port to stable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stay consistent with other multiple output packages.
This was discussed previously at #28470 (comment) and AFAICT this simply does work. Full
nox-reviewis still running overnight butnixos/release.nix -A tests.plasma5.x86_64-linuxpassed.According to
all package references should be fixed as well (all using
getLiband such).