public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix the path to bash.

Browse Source 
* Add openssl as a dependency.

svn path=/nixpkgs/trunk/; revision=19436
This commit is contained in:
Eelco Dolstra 2010-01-14 14:26:35 +00:00
parent 3f30914672
commit c63858a169
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
View File

@ -1,8 +1,10 @@
{stdenv, fetchurl, unzip, ruby, makeWrapper}: { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ec2-ami-tools"; name = "ec2-ami-tools";
buildInputs = [unzip makeWrapper]; buildInputs = [unzip makeWrapper];
src = fetchurl { src = fetchurl {
url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
sha256 = "2a7c848abea286234adcbb08938cfad50b844ecdfc7770e781289d9d396a1972"; sha256 = "2a7c848abea286234adcbb08938cfad50b844ecdfc7770e781289d9d396a1972";
@ -17,10 +19,10 @@ stdenv.mkDerivation {
for i in $out/bin/*; do for i in $out/bin/*; do
wrapProgram $i \ wrapProgram $i \
--set EC2_HOME $out \ --set EC2_HOME $out \
--set PATH '$PATH:${ruby}/bin' --prefix PATH : ${ruby}/bin:${openssl}/bin
done 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 = { meta = {

2
pkgs/top-level/all-packages.nix
View File

@ -334,7 +334,7 @@ let
}; };
ec2amitools = import ../tools/virtualization/amazon-ec2-ami-tools { 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 { amule = import ../tools/networking/p2p/amule {