public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31628 from lheckemann/fbterm-arm

Browse Source 
fbterm: fix build on non-x86
This commit is contained in:
Franz Pletz 2017-11-14 12:39:51 +01:00 committed by GitHub
commit 172d346ff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/fbterm/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: {stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -9,7 +9,8 @@ let
url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz";
sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
}; };
buildInputs = [gpm freetype fontconfig ncurses libx86]; buildInputs = [gpm freetype fontconfig ncurses]
++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;