diff options
Diffstat (limited to 'pkgs/os-specific/linux/fbterm')
-rw-r--r-- | pkgs/os-specific/linux/fbterm/default.nix | 48 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fbterm/default.upstream | 3 | ||||
-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 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fbterm/stdenv.nix | 35 |
5 files changed, 25 insertions, 74 deletions
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 0201422cdf9f5..59f93e836c414 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,37 +1,33 @@ -a : -let - fetchurl = a.fetchurl; - - buildInputs = with a; [ - gpm freetype fontconfig pkgconfig ncurses - ]; - s = import ./src-for-default.nix; +{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses}: +let + s = # Generated upstream information + rec { + baseName="fbterm"; + version="1.7.0"; + name="fbterm-1.7.0"; + hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; + sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + }; + buildInputs = [gpm freetype fontconfig pkgconfig ncurses]; in -rec { - src = a.fetchUrlFromSrcInfo s; - inherit(s) name; +stdenv.mkDerivation { + inherit (s) name version; + src = fetchurl { + inherit (s) url sha256; + }; inherit buildInputs; - configureFlags = []; - - fixInc = a.fullDepEntry ('' + preConfigure = '' 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 = ["setVars" "fixInc" "fixMakeInstall" "doConfigure" "doMakeInstall"]; - + ''; meta = { + inherit (s) version; description = "Framebuffer terminal emulator"; - maintainers = [a.lib.maintainers.raskin]; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/fbterm/default.upstream b/pkgs/os-specific/linux/fbterm/default.upstream new file mode 100644 index 0000000000000..387ef8862fbf2 --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/default.upstream @@ -0,0 +1,3 @@ +url http://code.google.com/p/fbterm/downloads/list +version_link '[.]tar[.][a-z0-9]+$' +process 'code[.]google[.]com//' '' diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix deleted file mode 100644 index 6705404ac9f51..0000000000000 --- a/pkgs/os-specific/linux/fbterm/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - 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.7.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 deleted file mode 100644 index b0c439714fb63..0000000000000 --- a/pkgs/os-specific/linux/fbterm/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://code.google.com/p/fbterm/"; - baseName = "fbterm"; -} diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix deleted file mode 100644 index e257a7d46eba0..0000000000000 --- a/pkgs/os-specific/linux/fbterm/stdenv.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Quick version to be able to cross-build fbterm meanwhile builderDefs cannot -# cross-build with an equivalent to the stdenvCross adapter. -{ stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }: - -let - version="1.7"; - name="fbterm-1.7"; - hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh"; - url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - inherit url; - sha256 = hash; - }; - - buildNativeInputs = [ ncurses ]; - buildInputs = [ gpm freetype fontconfig pkgconfig ]; - - 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:\ - ' -i src/Makefile.in - - export HOME=$PWD; - - export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype" - # This is only relevant cross-building - export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -lfreetype" - ''; -} |