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

Small fixes to ARB

Browse Source 
Included older kernel headers

svn path=/nixpkgs/trunk/; revision=12961
This commit is contained in:
Pjotr Prins 2008-10-05 10:56:47 +00:00
parent 512b18ea4a
commit 6d70506401
2 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/science/biology/arb/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
patches = [ ./makefile.patch ]; patches = [ ./makefile.patch ];
buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv xfig gnuplot ]; buildInputs = [glew mesa libpng x11 libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
@ -27,26 +27,19 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
datadir=/nix/var/lib/arb
ensureDir $out/lib ensureDir $out/lib
shareddir=/nix/var/lib/arb # link out shared location
# link out writable shared location lib/pts ensureDir $datadir/lib/pts
ensureDir $shareddir/lib/pts chmod a+rwx $datadir/lib/pts
cp -vau lib/pts $shareddir/lib # cp -vau lib/pts $datadir/lib
rm -vrf lib/pts rm -vrf lib/pts
ln -vs $shareddir/lib/pts $out/lib/pts ln -vs $datadir/lib/pts $out/lib/pts
chmod a+rw -R $shareddir/lib/pts # link out shared location
# link out writable shared location lib/nas/ ensureDir $datadir/lib/nas
ensureDir $shareddir/lib/nas cp -vau lib/nas $datadir/lib
cp -vau lib/nas $shareddir/lib
rm -vrf lib/nas rm -vrf lib/nas
ln -vs $shareddir/lib/nas $out/lib/nas ln -vs $datadir/lib/nas $out/lib/nas
chmod a+rw -R $shareddir/lib/nas
# link out shared lib/pixmaps (not sure about this, yet):
ensureDir $shareddir/lib/pixmaps
cp -vau lib/pixmaps $shareddir/lib
rm -vrf lib/pixmaps
ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps
chmod a+rw -R $shareddir/lib/pixmaps
# bulk copy # bulk copy
cp -vau * $out cp -vau * $out
# replace arb script # replace arb script
@ -55,8 +48,7 @@ stdenv.mkDerivation {
#!/bin/sh #!/bin/sh
echo Starting Nix compiled arb from $out echo Starting Nix compiled arb from $out
echo Shared databases are located in $shareddir echo Shared databases are located in $datadir
# sometimes local profiles override these:
export ARBHOME=$out export ARBHOME=$out
export LD_LIBRARY=$ARBHOME/lib export LD_LIBRARY=$ARBHOME/lib
@ -68,10 +60,9 @@ ARB
meta = { meta = {
description = "ARB software for sequence database handling and analysis"; description = "ARB software for sequence database handling and analysis";
longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria. Note that this package includes its own older versions of clustal etc.''; longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria'';
license = "non-free"; license = "non-free";
pkgMaintainer = "http://BioLib.open-bio.org/"; pkgMaintainer = "Pjotr Prins";
homepage = http://www.arb-home.de/; homepage = http://www.arb-home.de/;
priority = "10"; # because it includes binaries of clustal etc.
}; };
} }

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

@ -4979,11 +4979,6 @@ let
kernelHeaders = kernelHeaders_2_6_23; kernelHeaders = kernelHeaders_2_6_23;
kernelHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {
inherit fetchurl stdenv unifdef;
};
kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix { kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -7345,11 +7340,9 @@ let
arb = import ../applications/science/biology/arb { arb = import ../applications/science/biology/arb {
inherit fetchurl stdenv readline libpng zlib x11 lesstif freeglut perl; inherit fetchurl stdenv readline libpng zlib x11 lesstif freeglut perl;
inherit (xlibs) libXpm libXaw libX11 libXext libXt; inherit (xlibs) libXpm libXaw;
# motif = lesstif; # motif = lesstif;
inherit mesa glew libtiff lynx rxp sablotron jdk transfig; inherit mesa glew libtiff lynx rxp sablotron jdk;
# supporting tools
inherit gv xfig gnuplot;
}; };
biolib = import ../development/libraries/science/biology/biolib { biolib = import ../development/libraries/science/biology/biolib {