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

mpd: fix on i686 #22717

Merged
merged 1 commit into from Feb 13, 2017
Merged

mpd: fix on i686 #22717

merged 1 commit into from Feb 13, 2017

Conversation

Profpatsch
Copy link
Member

Was submitted to upstream, but fix here in the meantime.

  • builds on i686 now

Was submtitted to upstream, but fix here in the meantime.
@mention-bot
Copy link

@Profpatsch, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @astsmtl and @rickynils to be potential reviewers.


-#include "lib/ffmpeg/Time.hxx"
#include "config.h"
+#include "lib/ffmpeg/Time.hxx"
Copy link
Member

Choose a reason for hiding this comment

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

Does it seem strange to you that this patch fixes it?

Copy link
Member

@Mic92 Mic92 Feb 13, 2017

Choose a reason for hiding this comment

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

Actually not, C/C++ headers are broken by design.

Copy link
Member Author

Choose a reason for hiding this comment

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

No, their imports are order-dependent. That is, on i686 systems the software will not work correctly if config.h is not imported first. That is checked by a file check.h, and only if it’s a non-release build and it’s compiled for i686.

I point you to the thread at http://mailman.blarg.de/pipermail/mpd-devel/2017-February/000601.html for further incompetence.

Copy link
Member Author

Choose a reason for hiding this comment

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

I’m kind of done with mpd by now, I just stream stuff to a pulseaudio sink. No idea why I thought setting one up again was a good idea. Certainly a waste of time …

@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi";
};

patches = [ ./i386.patch ];
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment, that this can be probably removed in the next release?

Copy link
Member

Choose a reason for hiding this comment

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

Merged because the patch will fail to apply saying it was already applied.

@grahamc grahamc merged commit 0d52f15 into NixOS:master Feb 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants