summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2007-12-06 19:36:43 +0000
committerMichael Raskin <7c6f434c@mail.ru>2007-12-06 19:36:43 +0000
commit58610e801adbf6a9cc31105408344bcfe747bc22 (patch)
tree1612ee1c3513bc8b3adc9c774fee3abf45538ae2
parent285a11f346997d6fe8cc539b7d726f211a13045e (diff)
downloadnixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar.gz
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar.bz2
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar.lz
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar.xz
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.tar.zst
nixpkgs-58610e801adbf6a9cc31105408344bcfe747bc22.zip
Added curses variant of util-linux. cfdisk is a fine tool..
svn path=/nixpkgs/trunk/; revision=9870
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 7f54a0c32ee..0c7ebef7eb3 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "util-linux-2.13-pre7";
@@ -10,6 +10,10 @@ stdenv.mkDerivation {
   
   configureFlags = "--disable-use-tty-group";
 
+  buildInputs = [] 
+  	++ (if args ? ncurses then [args.ncurses] else [])
+  ;
+
   preBuild = "
     makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt)
   ";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07352fde50d..26508e2aae6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3530,6 +3530,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  utillinuxCurses = import ../os-specific/linux/util-linux {
+    inherit fetchurl stdenv ncurses;
+  };
+
   utillinuxStatic = lowPrio (appendToName "static" (import ../os-specific/linux/util-linux {
     inherit fetchurl;
     stdenv = makeStaticBinaries stdenv;