diff options
| author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
| commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
| tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/development/compilers/nvidia-cg-toolkit/default.nix | |
| parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
| parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) | |
| download | nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.gz nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.bz2 nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.lz nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.xz nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.zst nixpkgs-ea195b2507b9068d966009d27c0e90b57d88f30d.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/development/compilers/nvidia-cg-toolkit/default.nix')
| -rw-r--r-- | pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 69596ed66f4..23b5883c009 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -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/" |