fbterm: fix build on non-x86 #31628
Merged
fbterm: fix build on non-x86 #31628
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
grahamc
reviewed
Nov 13, 2017
| @@ -9,7 +9,8 @@ let | |||
| url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; | |||
| sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; | |||
| }; | |||
| buildInputs = [gpm freetype fontconfig ncurses libx86]; | |||
| buildInputs = [gpm freetype fontconfig ncurses libx86] | |||
| ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; | |||
There was a problem hiding this comment.
This is the same thing isn't it? Just adding libx86 a second time?
There was a problem hiding this comment.
That would be a cherry-pick gone wrong, whoops! Fixed.
lheckemann
force-pushed
the
fbterm-arm
branch
from
b66e588
to
e507457
Compare
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
It didn't want to build!
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)