* Merged the stdenv branch

  (https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073

4 files changed, 23 insertions, 20 deletions

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 2a773584bdb..46f40167a7e 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "libcap-2.07";
+  name = "libcap-2.09";
   
   src = fetchurl {
-    url = mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/libcap-2.07.tar.gz;
-    sha256 = "1zz8nyqzb15lf31akwyzzfdhyhf9xvl9rqih90m9kypmcmc4yz5q";
+    url = mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/libcap-2.09.tar.bz2;
+    sha256 = "0sq15y8yfm7knf6jhqcycb9wz52n3r1sriii66xk0djvd4hw69jr";
   };
   
   buildInputs = [attr];
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix
index bbf63e43c8b..34de5108164 100644
--- a/pkgs/os-specific/linux/nss_ldap/default.nix
+++ b/pkgs/os-specific/linux/nss_ldap/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0kn022js39mqmy7g5ba911q46223vk7vcf51x28rbl86lp32zv4v";
   };
 
-  preInstall = "
+  preInstall = ''
     installFlagsArray=(INST_UID=$(id -u) INST_GID=$(id -g) LIBC_VERS=2.5 NSS_VERS=2 NSS_LDAP_PATH_CONF=$out/etc/ldap.conf)
-    substituteInPlace Makefile --replace '/usr$(libdir)' $TMPDIR
+    substituteInPlace Makefile \
+      --replace '/usr$(libdir)' $TMPDIR \
+      --replace 'install-data-local:' 'install-data-local-disabled:'
     ensureDir $out/etc
-  ";
+  '';
 
   buildInputs = [openldap];
 }
diff --git a/pkgs/os-specific/linux/nvidia/builder.sh b/pkgs/os-specific/linux/nvidia/builder.sh
index 00d70d6198f..cb4e67614bb 100755
--- a/pkgs/os-specific/linux/nvidia/builder.sh
+++ b/pkgs/os-specific/linux/nvidia/builder.sh
@@ -8,8 +8,7 @@ unpackFile() {
 }
 
 
-buildPhase=myBuildPhase
-myBuildPhase() {
+buildPhase() {
     echo "Building linux driver against kernel: " $kernel;
 
     cd usr/src/nv/
@@ -28,8 +27,7 @@ myBuildPhase() {
 }
 
 
-installPhase=myInstallPhase
-myInstallPhase() {
+installPhase() {
 
     # Install the kernel module.
     ensureDir $out/lib/modules/$kernelVersion/misc
@@ -58,15 +56,15 @@ myInstallPhase() {
     # Install the programs.
     ensureDir $out/bin
 
-    fullPath=$out/lib
-    for i in $libPath; do
-	fullPath=$fullPath:$i/lib
-    done
+    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*.*
+    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*.*
+    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*.*
+    patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*.*
 
     for i in nvidia-settings nvidia-xconfig; do
 	cp usr/bin/$i $out/bin/$i
 	patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-	    --set-rpath $fullPath $out/bin/$i
+	    --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
     done
     
     # Header files etc.
diff --git a/pkgs/os-specific/linux/nvidia/default.nix b/pkgs/os-specific/linux/nvidia/default.nix
index b38e302ddd4..9ad1abd621b 100644
--- a/pkgs/os-specific/linux/nvidia/default.nix
+++ b/pkgs/os-specific/linux/nvidia/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel, xlibs, gtkLibs}:
+{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}:
 
 let 
 
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nvidiaDrivers-${versionNumber}-${kernel.version}";
+  name = "nvidia-x11-${versionNumber}-${kernel.version}";
   
   builder = ./builder.sh;
   
@@ -30,8 +30,11 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  libPath = [
-    gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib 
-    xlibs.libXext xlibs.libX11 xlibs.libXv
+  glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11];
+
+  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
+
+  programPath = stdenv.lib.makeLibraryPath [
+    gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib xlibs.libXv
   ];
 }