From 085518614c1feb8b47b601f5e4c53eb1f4003a2f Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Mon, 10 Oct 2005 00:55:07 +0000
Subject: [PATCH] Added bc :P

svn path=/nixpkgs/trunk/; revision=4045
---
 pkgs/system/all-packages-generic.nix |  7 ++++++-
 pkgs/tools/misc/bc/default.nix       | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/bc/default.nix

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 20901e68596..f300ca236d4 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -35,6 +35,10 @@ rec {
 
   ### TOOLS
 
+  bc = (import ../tools/misc/bc) {
+    inherit fetchurl stdenv flex;
+  };
+
   coreutils = (import ../tools/misc/coreutils) {
     inherit fetchurl stdenv;
   };
@@ -639,7 +643,8 @@ rec {
   };
 
   apacheAnt14 = (import ../development/tools/build-managers/apache-ant) {
-    inherit fetchurl stdenv jdk;
+    inherit fetchurl stdenv;
+    jdk = j2sdk14x;
     name = "ant-jdk-1.4.2";
   };
 
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
new file mode 100644
index 00000000000..18d00169729
--- /dev/null
+++ b/pkgs/tools/misc/bc/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, flex}:
+
+stdenv.mkDerivation {
+  name = "bc-1.0.6";
+  src = fetchurl {
+    url = http://ftp.gnu.org/pub/gnu/bc/bc-1.06.tar.gz;
+    md5 = "d44b5dddebd8a7a7309aea6c36fda117";
+  };
+
+  buildInputs = [flex];
+}