Author: viric
Date: Fri Nov 26 17:56:23 2010
New Revision: 24880
URL: https://svn.nixos.org/websvn/nix/?rev=24880&sc=1
Log:
Adding a fbterm variant building with stdenv to get cross-build-ability
(I want it in the nanonote)
Added:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/fbterm/stdenv.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Added: nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/fbterm/stdenv.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/fbterm/stdenv.nix
Fri Nov 26 17:56:23 2010 (r24880)
@@ -0,0 +1,32 @@
+# 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.5";
+ name="fbterm-1.5";
+ hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+ 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 ];
+
+ patchPhase = ''
+ 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"
+ '';
+}
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Nov
26 17:55:22 2010 (r24879)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Nov
26 17:56:23 2010 (r24880)
@@ -4491,6 +4491,8 @@
inherit fontconfig gpm freetype pkgconfig ncurses;
};
+ fbtermStdenv = callPackage ../os-specific/linux/fbterm/stdenv.nix { };
+
fuse = callPackage ../os-specific/linux/fuse { };
fxload = callPackage ../os-specific/linux/fxload { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
