barrier: fix compilation on Qt 5.11 #42842
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
infinisil
requested changes
Jul 1, 2018
| @@ -13,9 +13,17 @@ stdenv.mkDerivation rec { | |||
| buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; | |||
| propagatedBuildInputs = with qt5; [ qtbase ]; | |||
|
|
|||
| patches = [ | |||
| # Fix compilation on Qt 5.11 | |||
There was a problem hiding this comment.
You should add a note that this can be removed on the next version, since the commit is in master already, see debauchee/barrier#49
|
Also, can you squash those changes into one commit? |
kliu128
force-pushed
the
barrier-fix-qt-5.11
branch
from
b516423
to
5aa51e5
Compare
infinisil
approved these changes
Jul 2, 2018
|
LGTM. Thanks! |
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.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)