From 183940edd3b717f7ee8cb8ce75dd656f257331f0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 8 Dec 2007 01:05:39 +0000
Subject: [PATCH] Not yet working nfs-utils with dependency

svn path=/nixpkgs/branches/stdenv-updates/; revision=9874
---
 pkgs/os-specific/linux/nfs-utils/default.nix  | 17 ++++++++++
 .../os-specific/linux/tcp-wrapper/default.nix | 26 ++++++++++++++++
 pkgs/top-level/all-packages.nix               | 31 ++++++++++++-------
 3 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/os-specific/linux/nfs-utils/default.nix
 create mode 100644 pkgs/os-specific/linux/tcp-wrapper/default.nix

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
new file mode 100644
index 00000000000..5240bba5d14
--- /dev/null
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -0,0 +1,17 @@
+args:
+args.stdenv.mkDerivation {
+  name = "nfs-utils-1.1.1";
+
+  src = args.fetchurl {
+    url = mirror://sourceforge/nfs/nfs-utils-1.1.1.tar.gz;
+    sha256 = "0aa434cv7lgbrhks0rzhwxvbk2zsa17kjwxqjrrh87zrv9d2sr1x";
+  };
+
+  buildInputs =(with args; [kernelHeaders tcp_wrapper]);
+
+  meta = { 
+      description = "nfs utils";
+      homepage = http://nfs.sourceforge.net/;
+      license = "GPL2";
+  };
+}
diff --git a/pkgs/os-specific/linux/tcp-wrapper/default.nix b/pkgs/os-specific/linux/tcp-wrapper/default.nix
new file mode 100644
index 00000000000..35c68a6d9a4
--- /dev/null
+++ b/pkgs/os-specific/linux/tcp-wrapper/default.nix
@@ -0,0 +1,26 @@
+args:
+args.stdenv.mkDerivation {
+  name = "tcp-wrappers-7.6";
+
+  src = args.fetchurl {
+    url = http://ftp.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
+    sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
+  };
+  
+  # we need to set REAL_DAEMON_DIR somehow. I'm getting compilation errors
+  # I've managed to compile tcpd manually using 
+  # make CFLAGS='-DSYS_ERRLIST_DEFINED=1  -Dvsyslog=1' tcpd
+  # see Makefile target all for details
+
+  postUnpack="cd upstream/tarballs; tar xfz *; cd tcp_wrappers_7.6;
+    sed -i -e 's=#REAL_DAEMON_DIR=/usr/sbin=REAL_DAEMON_DIR=/usr/sbin=' Makefile
+          ";
+
+  buildPhase="
+    make CFLAGS='-DSYS_ERRLIST_DEFINED=1  -Dvsyslog=1' tcpd
+  "
+
+  buildInputs =(with args; [kernelHeaders gnused]);
+
+  # meta = ...
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ad5f88ab4b..de5df53468a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1185,24 +1185,22 @@ rec {
   perl = if !stdenv.isLinux then sysPerl else realPerl;
 
   # FIXME: unixODBC needs patching on Darwin (see darwinports)
-  php = import ../development/interpreters/php {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
-    unixODBC =
-      if stdenv.isDarwin then null else unixODBC;
-  };
+  #php = import ../development/interpreters/php {
+    #inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
+    #unixODBC =
+      #if stdenv.isDarwin then null else unixODBC;
+  #};
 
   # FIXME somehow somewhen: We need to recompile php if the ini file changes because the only way to
   # tell the apache module where to look for this file is using a compile time flag ;-(
   # perhaps this can be done setting php_value in apache don't have time to investigate any further ?
   # This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need?
-  /*
-  php_unstable = (import ../development/interpreters/php_configurable) {
-   inherit mkDerivationByConfiguration stdenv;
+  php = (import ../development/interpreters/php_configurable) {
+   inherit mkDerivationByConfiguration;
    lib = lib_unstable;
    inherit fetchurl flex bison apacheHttpd mysql; # gettext;
    inherit libxml2;
   };
-  */
 
   python = getVersion "python" python_alts;
 
@@ -2796,9 +2794,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  #nfsUtils = import ../os-specific/linux/nfs-utils {
-  #  inherit fetchurl stdenv;
-  #};
+  /*
+  nfsUtils = import ../os-specific/linux/nfs-utils {
+   inherit fetchurl stdenv kernelHeaders tcp_wrapper;
+  };
+  */
 
   alsaLib = import ../os-specific/linux/alsa/library {
     inherit fetchurl stdenv;
@@ -3158,6 +3158,13 @@ rec {
     withoutInitTools = true;
   };
 
+  /*
+  # needed for nfs utils
+  tcp_wrapper = import ../os-specific/linux/tcp-wrapper {
+    inherit fetchurl stdenv kernelHeaders gnused;
+  };
+  */
+
   udev = import ../os-specific/linux/udev {
     inherit fetchurl stdenv;
   };