diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
| commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
| tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/os-specific/linux/fbterm/stdenv.nix | |
| parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
| parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
| download | nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip | |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/os-specific/linux/fbterm/stdenv.nix')
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/stdenv.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix index 893dba11b60..e257a7d46eb 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 = '' + preConfigure = '' 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:\ |