JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for building uml_mconsole

Browse Source 
svn path=/nixpkgs/trunk/; revision=12433
This commit is contained in:
Marc Weber 2008-07-26 01:02:27 +00:00
parent 0abfffc0f2
commit 01cbcd94b3
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/uml-utilities/builder.sh
View File

@ -3,7 +3,9 @@ source $stdenv/setup
tar xvfj $src
cd tools
sed -e 's/mconsole//' -e '1s/.*/TUNCTL = \$(shell [ -n tunctl ] \&\& echo tunctl)/' -i Makefile
[ -n "$tunctl" ] && sed -e '1s/.*/TUNCTL = tunctl/' -i Makefile
[ -z "$mconsole" ] && sed -e 's/mconsole//' -i Makefile
mkdir $out
mkdir $out/bin
mkdir $out/lib
@ -11,4 +13,5 @@ mkdir $out/lib/uml
make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml
make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml install
ln -s $out/lib/uml/port-helper $out/bin/port-helper
[ -n $tunctl ] && [ -f $out/bin/tunctl ] || fail_no_tunctl
[ -z "$tunctl" ] || [ -f $out/bin/tunctl ] || fail_no_tunctl
[ -z "$mconsole" ] || [ -f $out/bin/uml_mconsole ] || fail_no_mconsole

7
pkgs/os-specific/linux/uml-utilities/default.nix
View File

@ -1,8 +1,9 @@
{stdenv, fetchurl, kernelHeaders , tunctl ? false}:
{lib, stdenv, fetchurl, kernelHeaders , readline, tunctl ? false, mconsole ? false}:
stdenv.mkDerivation {
inherit tunctl;
buildInputs = if tunctl then kernelHeaders else null;
inherit tunctl mconsole;
buildInputs = lib.optional tunctl kernelHeaders
++ lib.optional mconsole readline;
name = "uml-utilities-20040114";
builder = ./builder.sh;
src = fetchurl {

4
pkgs/top-level/all-packages.nix
View File

@ -5415,8 +5415,8 @@ let pkgs = rec {
};
umlutilities = import ../os-specific/linux/uml-utilities {
inherit fetchurl kernelHeaders stdenv;
tunctl = true;
inherit fetchurl kernelHeaders stdenv readline lib;
tunctl = true; mconsole = true;
};
upstart = import ../os-specific/linux/upstart {