diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-10-27 23:49:59 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-10-27 23:49:59 +0000 |
| commit | ab85fbeec4016e94c119df7e589b853004b17767 (patch) | |
| tree | 59a8fd463b0d87330c3e949a5d499e42aec4b63c /pkgs/os-specific/linux/fbterm | |
| parent | cd04c58fe224294582069eb5e40f0ab2b581d014 (diff) | |
| download | nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar.gz nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar.bz2 nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar.lz nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar.xz nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.tar.zst nixpkgs-ab85fbeec4016e94c119df7e589b853004b17767.zip | |
Updating fbterm
svn path=/nixpkgs/trunk/; revision=17981
Diffstat (limited to 'pkgs/os-specific/linux/fbterm')
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/src-for-default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/src-info-for-default.nix | 4 |
3 files changed, 28 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index c29df5f389a..0201422cdf9 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -2,17 +2,14 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "1.2" a; buildInputs = with a; [ - gpm fontconfig freetype pkgconfig + gpm freetype fontconfig pkgconfig ncurses ]; + s = import ./src-for-default.nix; in rec { - src = fetchurl { - url = "http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; - sha256 = "0q4axmnpwlpjlpaj19iw7nyxkqsvwq767szdkzsgancq99afwqyd"; - }; - + src = a.fetchUrlFromSrcInfo s; + inherit(s) name; inherit buildInputs; configureFlags = []; @@ -20,10 +17,19 @@ rec { sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp '') ["doUnpack" "minInit"]; + fixMakeInstall = a.fullDepEntry ('' + sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\ + ' -i src/Makefile.in + '') ["doUnpack" "minInit"]; + + setVars = a.noDepEntry ('' + export HOME=$PWD; + export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype" + '') ; + /* doConfigure should be removed if not needed */ - phaseNames = ["fixInc" "doConfigure" "doMakeInstall"]; + phaseNames = ["setVars" "fixInc" "fixMakeInstall" "doConfigure" "doMakeInstall"]; - name = "fbterm-" + version; meta = { description = "Framebuffer terminal emulator"; maintainers = [a.lib.maintainers.raskin]; diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix new file mode 100644 index 00000000000..39aaa2ca626 --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/src-for-default.nix @@ -0,0 +1,9 @@ +rec { + version="1.5"; + name="fbterm-1.5"; + hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb"; + url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; + advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.5.tar.gz"; + + +} diff --git a/pkgs/os-specific/linux/fbterm/src-info-for-default.nix b/pkgs/os-specific/linux/fbterm/src-info-for-default.nix new file mode 100644 index 00000000000..b0c439714fb --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/src-info-for-default.nix @@ -0,0 +1,4 @@ +{ + downloadPage = "http://code.google.com/p/fbterm/"; + baseName = "fbterm"; +} |