diff options
| author | Linus Heckemann <git@sphalerite.org> | 2019-10-27 17:02:34 +0100 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2019-10-27 17:06:59 +0100 |
| commit | 794396755238058bffc224cfe68299122be71267 (patch) | |
| tree | 3906c0c367e0c71aa1c2775ec52bcb85a9c97677 /pkgs/os-specific/linux/fbterm | |
| parent | 4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d (diff) | |
| download | nixpkgs-794396755238058bffc224cfe68299122be71267.tar nixpkgs-794396755238058bffc224cfe68299122be71267.tar.gz nixpkgs-794396755238058bffc224cfe68299122be71267.tar.bz2 nixpkgs-794396755238058bffc224cfe68299122be71267.tar.lz nixpkgs-794396755238058bffc224cfe68299122be71267.tar.xz nixpkgs-794396755238058bffc224cfe68299122be71267.tar.zst nixpkgs-794396755238058bffc224cfe68299122be71267.zip | |
fbterm: fix cross-build
Diffstat (limited to 'pkgs/os-specific/linux/fbterm')
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/select.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index c8fc633f8bd..d56b254d382 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -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; { diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/os-specific/linux/fbterm/select.patch new file mode 100644 index 00000000000..549674047a9 --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/select.patch @@ -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" |