From c63858a16919de0f929d8377ce616e93a99f2074 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jan 2010 14:26:35 +0000
Subject: [PATCH] * Fix the path to bash. * Add openssl as a dependency.

svn path=/nixpkgs/trunk/; revision=19436
---
 .../tools/virtualization/amazon-ec2-ami-tools/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index 179648d1091a..58a833a33eae 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,8 +1,10 @@
-{stdenv, fetchurl, unzip, ruby, makeWrapper}:
+{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "ec2-ami-tools";
+  
   buildInputs = [unzip makeWrapper];
+  
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
     sha256 = "2a7c848abea286234adcbb08938cfad50b844ecdfc7770e781289d9d396a1972";
@@ -17,10 +19,10 @@ stdenv.mkDerivation {
       for i in $out/bin/*; do
           wrapProgram $i \
             --set EC2_HOME $out \
-            --set PATH '$PATH:${ruby}/bin'
+            --prefix PATH : ${ruby}/bin:${openssl}/bin
       done
       
-      sed -i 's|/bin/bash|${stdenv.shell}/bin/bash|' $out/lib/ec2/platform/base/pipeline.rb
+      sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
     ''; 
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33ed143f84a5..f84b0ebbd872 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -334,7 +334,7 @@ let
   };
 
   ec2amitools = import ../tools/virtualization/amazon-ec2-ami-tools {
-    inherit stdenv fetchurl unzip makeWrapper ruby;
+    inherit stdenv fetchurl unzip makeWrapper ruby openssl;
   };
 
   amule = import ../tools/networking/p2p/amule {