From d1e84a7498eb73c2f4a48953db5227dfa3e0afd1 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 24 Feb 2012 20:18:32 +0000 Subject: Blind commit trying to fix nvidia cg toolkit on i686-linux svn path=/nixpkgs/trunk/; revision=32546 --- pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/development/compilers/nvidia-cg-toolkit') diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 06f1d74382eec..083b420318c7b 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { 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 \ - ${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 ensureDir "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" -- cgit 1.4.1 From bfd787a69a4bf8c2b170063f3b9416f0df24ddf9 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 24 Feb 2012 23:40:58 +0000 Subject: Finally I fix, not blindly, the nvidia-cg-toolkit expression for i686-linux svn path=/nixpkgs/trunk/; revision=32554 --- pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/nvidia-cg-toolkit') diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 083b420318c7b..d6b7d70100bf4 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 ensureDir "$out/bin/" -- cgit 1.4.1