From 01cbcd94b3addea3bfe91cb439f3052e4399a474 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 26 Jul 2008 01:02:27 +0000
Subject: [PATCH] added support for building uml_mconsole

svn path=/nixpkgs/trunk/; revision=12433
---
 pkgs/os-specific/linux/uml-utilities/builder.sh  | 7 +++++--
 pkgs/os-specific/linux/uml-utilities/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/uml-utilities/builder.sh b/pkgs/os-specific/linux/uml-utilities/builder.sh
index dc3bd76f8fe..00b40278889 100644
--- a/pkgs/os-specific/linux/uml-utilities/builder.sh
+++ b/pkgs/os-specific/linux/uml-utilities/builder.sh
@@ -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
diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix
index 108f87a424a..3e085b41ebf 100644
--- a/pkgs/os-specific/linux/uml-utilities/default.nix
+++ b/pkgs/os-specific/linux/uml-utilities/default.nix
@@ -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 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fed298c16d..a0777bf612f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {