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

pkgs/tools/package-management/nix/custom.nix

@@ -33,16 +33,20 @@ stdenv.mkDerivation {
   ;
 
   preConfigure = 
-  (lib.concatMapStrings (script: ''sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am
+    (lib.concatMapStrings (script:
-  '') enableScripts)
+      ''
-  + preConfigure
+        sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am
-  + "\n./bootstrap.sh"
+      ''
-  ;
+    ) enableScripts)
+    + preConfigure
+    + "\n./bootstrap.sh";
 
-  configureFlags = ["
+  configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
     --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
-    --disable-init-state"] ++ configureFlags ;
+    --disable-init-state
+    ${configureFlags}
+  '';
 
   meta = {
     description = "The Nix Deployment System";