Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6ad758c185b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 172d346ff1b8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 14, 2017

  1. fbterm: fix build on non-x86

    @lheckemann
    lheckemann committed Nov 14, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    mogorman Matthew O'Gorman
    GPG key ID: F71F32386DEAE4B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e507457 View commit details

  2. Merge pull request #31628 from lheckemann/fbterm-arm 

    fbterm: fix build on non-x86
    @fpletz
    fpletz authored Nov 14, 2017
    Copy the full SHA
    172d346 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/os-specific/linux/fbterm/default.nix
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/fbterm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
let
s = # Generated upstream information
rec {
@@ -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]
++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;
in
stdenv.mkDerivation {
inherit (s) name version;