* Merged the stdenv branch

(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates -r10966:12061). svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
parent 4192f35202 cd60dc0ede
commit fc5eebdf8b
89 changed files with 1486 additions and 1852 deletions
@@ -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];
 }