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

Reverting 30393.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30394
This commit is contained in:
Alexander Tsamutali 2011-11-12 17:11:25 +00:00
parent 4f3ffcd0ec
commit 20005b7f5d
4 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
View File

@ -1,43 +0,0 @@
{ stdenv, fetchurl, patchelf }:
stdenv.mkDerivation rec {
version = "3.0";
date = "February2011";
name = "nvidia-cg-toolkit-${version}";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz";
sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam";
}
else null;
installPhase = ''
for b in cgc cgfxcat cginfo
do
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
done
# FIXME: cgfxcat and cginfo need more patchelf
ensureDir "$out/bin/"
cp -v bin/* "$out/bin/"
ensureDir "$out/include/"
cp -v -r include/Cg/ "$out/include/"
ensureDir "$out/lib/"
[ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
[ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
for mandir in man1 man3 manCg manCgFX
do
ensureDir "$out/share/man/$mandir/"
cp -v share/man/$mandir/* "$out/share/man/$mandir/"
done
ensureDir "$out/share/doc/$name/"
cp -v -r local/Cg/* "$out/share/doc/$name/"
'';
meta = {
homepage = http://developer.nvidia.com/cg-toolkit;
license = [ "nonfree-redistributable" ];
};
}

4
pkgs/games/mars/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }:
stdenv.mkDerivation rec {
name = "mars-${version}";
version = "0.7.4";
version = "0.7.2";
src = fetchurl {
url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
sha256 = "13a5pnsp4y2s7hpjlqfdic3a1zpd9fw3jwnzp4pr22szzby2klq7";
sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451";
};
buildInputs = [ cmake mesa sfml_git fribidi taglib ];
installPhase = ''

2
pkgs/stdenv/generic/setup.sh
View File

@ -269,7 +269,7 @@ fi
# Make GNU Make produce nested output.
#export NIX_INDENT_MAKE=1
export NIX_INDENT_MAKE=1
# Normalize the NIX_BUILD_CORES variable. The value might be 0, which

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

@ -2349,8 +2349,6 @@ let
menhir = callPackage ../development/ocaml-modules/menhir { };
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries {
camomile = camomile_0_8_2;
};