* Cleanup.

svn path=/nixpkgs/trunk/; revision=31476
This commit is contained in:
Eelco Dolstra 2012-01-10 23:49:24 +00:00
parent 061fe164be
commit acf6a9c5e4
1 changed files with 28 additions and 18 deletions

View File

@ -1,24 +1,33 @@
{fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi, zlib, { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
libuuid, gems}: , zlib, libuuid, gems, jdk }:
let let
patchUsrBinEnv = writeScript "path-usr-bin-env" '' patchUsrBinEnv = writeScript "path-usr-bin-env" ''
#!/bin/sh #!/bin/sh
set -x
echo "===================" echo "==================="
find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
''; '';
in in
{ {
sup = { buildInputs = [ gems.ncursesw ]; }; sup = { buildInputs = [ gems.ncursesw ]; };
sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
rails = { gemFlags = "--no-ri --no-rdoc"; }; rails = { gemFlags = "--no-ri --no-rdoc"; };
ncurses = { propagatedBuildInputs = [ ncurses ]; }; ncurses = { propagatedBuildInputs = [ ncurses ]; };
ncursesw = { propagatedBuildInputs = [ ncurses ]; }; ncursesw = { propagatedBuildInputs = [ ncurses ]; };
nokogiri = { nokogiri = {
buildFlags=["--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" buildFlags =
"--with-xslt-dir=${libxslt}" ]; [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
"--with-xslt-dir=${libxslt}"
];
}; };
ffi = { ffi = {
@ -28,7 +37,8 @@ in
}; };
xrefresh_server = xrefresh_server =
let patch = fetchurl { let
patch = fetchurl {
url = "http://mawercer.de/~nix/xrefresh.diff.gz"; url = "http://mawercer.de/~nix/xrefresh.diff.gz";
sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq"; sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
}; };
@ -39,7 +49,7 @@ in
postInstall = '' postInstall = ''
cd $out/${ruby.gemPath}/gems/* cd $out/${ruby.gemPath}/gems/*
zcat ${patch} | patch -p 1 zcat ${patch} | patch -p 1
''; ''; # */
}; };
xapian_full = { xapian_full = {