From 80717672b47f7b3fffaad9efa330264ac1a250e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 7 Jan 2012 14:41:04 +0000 Subject: [PATCH] Updating fbterm. svn path=/nixpkgs/trunk/; revision=31399 --- pkgs/os-specific/linux/fbterm/src-for-default.nix | 8 ++++---- pkgs/os-specific/linux/fbterm/stdenv.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix index 39aaa2ca626f..6705404ac9f5 100644 --- a/pkgs/os-specific/linux/fbterm/src-for-default.nix +++ b/pkgs/os-specific/linux/fbterm/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.5"; - name="fbterm-1.5"; - hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb"; + version="1.7"; + name="fbterm-1.7"; + hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh"; url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; - advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.5.tar.gz"; + advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.7.tar.gz"; } diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix index 893dba11b607..010f8e00ddcd 100644 --- a/pkgs/os-specific/linux/fbterm/stdenv.nix +++ b/pkgs/os-specific/linux/fbterm/stdenv.nix @@ -3,9 +3,9 @@ { stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }: let - version="1.5"; - name="fbterm-1.5"; - hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb"; + version="1.7"; + name="fbterm-1.7"; + hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh"; url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildNativeInputs = [ ncurses ]; buildInputs = [ gpm freetype fontconfig pkgconfig ]; - patchPhase = '' + postPatch = '' sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\