Merge pull request #72107 from lheckemann/fbterm-cross
fbterm: fix cross-build
This commit is contained in:
commit
5d20246ac2
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ncurses ];
|
||||
inherit buildInputs;
|
||||
|
||||
preConfigure = ''
|
||||
@ -31,6 +31,7 @@ stdenv.mkDerivation {
|
||||
preBuild = ''
|
||||
mkdir -p "$out/share/terminfo"
|
||||
tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm
|
||||
makeFlagsArray+=("AR=$AR")
|
||||
'';
|
||||
|
||||
patches = [
|
||||
@ -47,6 +48,7 @@ stdenv.mkDerivation {
|
||||
url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/miscoloring-fix.patch";
|
||||
sha256 = "1mjszji0jgs2jsagjp671fv0d1983wmxv009ff1jfhi9pbay6jd0";
|
||||
})
|
||||
./select.patch
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
12
pkgs/os-specific/linux/fbterm/select.patch
Normal file
12
pkgs/os-specific/linux/fbterm/select.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/fbio.cpp b/src/fbio.cpp
|
||||
index e5afc44..2485227 100644
|
||||
--- a/src/fbio.cpp
|
||||
+++ b/src/fbio.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <sys/select.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include "config.h"
|
Loading…
Reference in New Issue
Block a user