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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
This commit is contained in:
Shea Levy
2012-02-25 19:57:34 +00:00
parent 38e3d7bc86 385f242a40
commit ea195b2507
55 changed files with 637 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+4 -5
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
installPhase = ''
for b in cgc cgfxcat cginfo
do
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
done
# FIXME: cgfxcat and cginfo need more patchelf
mkdir -p "$out/bin/"
@@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/include/"
cp -v -r include/Cg/ "$out/include/"
mkdir -p "$out/lib/"
[ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
[ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
for mandir in man1 man3 \
${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
[ "$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
mkdir -p "$out/share/man/$mandir/"
cp -v share/man/$mandir/* "$out/share/man/$mandir/"