linux-pam: Drop musl patch that’s applied upstream #108693
Closed
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
|
Should be merged after #108685 |
|
@tobim, since you look at the previous musl related fix, maybe you can check this one too? |
tobim
suggested changes
Jan 7, 2021
| @@ -76,8 +76,7 @@ stdenv.mkDerivation (rec { | |||
| outputs = [ "out" "info" ]; | |||
|
|
|||
| nativeBuildInputs = [ perl xz.bin ] | |||
| ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch | |||
| ++ optionals stdenv.hostPlatform.isMusl [ autoreconfHook bison ]; # due to patch | |||
| ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ]; # due to patch | |||
There was a problem hiding this comment.
This is already done in your other PR. Added by mistake?
There was a problem hiding this comment.
No, I plan to merge this after the other has gone in (I believe that this depends on the other to even get far enough)
There was a problem hiding this comment.
I didn't see that it is in its own commit. It should work then.
|
Other patch is in now. |
nomeata
force-pushed
the
joachim/fix-108692
branch
from
8a4a606
to
f7cffa0
Compare
Thanks, rebased |
ofborg
bot
added
10.rebuild-linux: 0
and removed
10.rebuild-linux: 1
10.rebuild-linux: 1-10
labels
|
bleh sorry looks like #109906 got merged in front of this |
|
Nothing to be sorry about, as long as it gets fixed :-) |
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.
fixes: #108692