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

Dirty fix for BitTornado; draft support for .nar.bz2 in builder-defs; binary Firefox 3b1 (not that it works well, but a starting point anyway.)

Browse Source 
svn path=/nixpkgs/trunk/; revision=9899
This commit is contained in:
Michael Raskin 2007-12-10 16:56:55 +00:00
parent 67b8350ee6
commit 4830f9589b
4 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/applications/networking/browsers/firefox3b1/binary.nix Normal file
View File

@ -0,0 +1,53 @@
args: with args;
stdenv.mkDerivation {
name = "firefox-3b1";
src =
fetchurl {
url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b1/linux-i686/en-US/firefox-3.0b1.tar.bz2;
sha256 = "1cpcc5b07zdqyd5kiwhb4dqhy2mzbf97plsglcp6bc9054cmsylk";
};
buildInputs = [
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
python curl coreutils atk pango glib libX11 libXrender
freetype fontconfig libXft libXt
];
buildPhase = "
additionalRpath='';
for i in \$buildInputs ${stdenv.glibc} ${stdenv.gcc.gcc}; do
additionalRpath=\$additionalRpath:\$i/lib;
done
for i in firefox-bin ; do
oldrpath=$(patchelf --print-rpath \$i)
patchelf --set-rpath \$oldrpath\$additionalRpath \$i
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \$i
done
";
installPhase = "
export dontPatchELF=1;
mkdir -p \$out
cp -r . \$out/firefox
mkdir -p \$out/bin
ln -s \$out/firefox/firefox \$out/bin/firefox
sed -e 's@moz_libdir=.*@moz_libdir='\$out'/firefox/@' -i \$out/bin/firefox
sed -e 's@moz_libdir=.*@&\\nexport PATH=\$PATH:${coreutils}/bin@' -i \$out/bin/firefox
sed -e 's@`/bin/pwd@`${coreutils}/bin/pwd@' -i \$out/bin/firefox
sed -e 's@`/bin/ls@`${coreutils}/bin/ls@' -i \$out/bin/firefox
strip -S \$out/firefox/*.so || true
echo \"running firefox -register...\"
\$out/firefox/firefox-bin -register || false
";
meta = {
description = "Mozilla Firefox - the browser, reloaded";
};
passthru = {inherit gtk;};
}

4
pkgs/tools/networking/p2p/bit-tornado/default.nix
View File

@ -13,7 +13,9 @@ stdenv.mkDerivation {
installPhase = "python setup.py install --prefix=$out ;"+
" echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/python2.4/site-packages:"+
wxPython26+"/lib/python2.4/site-packages:"+
wxPython26+"/lib/python2.4/site-packages/wx-2.6-gtk2-unicode; "+
"'$out'/lib/python2.5/site-packages:"+
wxPython26+"/lib/python2.4/site-packages/wx-2.6-gtk2-unicode:"+
wxPython26+"/lib/python2.5/site-packages/wx-2.6-gtk2-unicode; "+
"python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 \"$@\";' >"+
"$out/bin/bittornado ; chmod a+rx $out/bin/bittornado;";

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

@ -3925,7 +3925,16 @@ rec {
#enableOfficialBranding = true;
});
firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox3b1/binary.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python curl coreutils freetype fontconfig;
inherit (gtkLibs) gtk atk pango glib;
inherit (gnome) libIDL;
inherit (xlibs) libXi libX11 libXrender libXft libXt;
});
firefox3b1Wrapper = wrapFirefox firefox3b1 "";
firefox3b1BinWrapper = wrapFirefox firefox3b1Bin "";
flac = import ../applications/audio/flac {
inherit fetchurl stdenv libogg;

4
pkgs/top-level/builder-defs.nix
View File

@ -13,6 +13,7 @@ args: with args; with stringsWithDeps; with lib;
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) then "tbz2"
else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
else (abort "unknown archive type : ${s}"));
defAddToSearchPath = FullDepEntry ("
@ -180,6 +181,9 @@ args: with args; with stringsWithDeps; with lib;
cp -r '${s}' .
cd \$(basename ${s})
chmod u+rwX -R .
" else if (archiveType s) == "narbz2" then "
bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2)
cd \$(basename ${s} .nar.bz2)
" else (abort "unknown archive type : ${s}"))+
(if args ? goSrcDir then args.goSrcDir else "")
) [minInit];