diff options
| -rw-r--r-- | pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 43 | ||||
| -rw-r--r-- | pkgs/games/mars/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 48 insertions, 3 deletions
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix new file mode 100644 index 000000000000..36d0cbaf23c2 --- /dev/null +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -0,0 +1,43 @@ +{ 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" ]; + }; +} diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 991afca6180c..4dd7d0435b2d 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz"; - sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451"; + sha256 = "13a5pnsp4y2s7hpjlqfdic3a1zpd9fw3jwnzp4pr22szzby2klq7"; }; buildInputs = [ cmake mesa sfml_git fribidi taglib ]; installPhase = '' diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ba06666ca898..71b405ec7158 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da6f33678f86..0fc171466761 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2349,6 +2349,8 @@ 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; }; |