* Indentation fixes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=22961

pkgs/development/compilers/gcc-4.5/default.nix

@@ -183,6 +183,7 @@ stdenv.mkDerivation ({
 
   buildNativeInputs = [ texinfo which ]
     ++ optional (perl != null) perl;
+    
   buildInputs = [ gmp mpfr mpc libelf gettext ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
@@ -241,50 +242,50 @@ stdenv.mkDerivation ({
 
   targetConfig = if (cross != null) then cross.config else null;
 
-   crossAttrs = {
+  crossAttrs = {
-     AR = "${stdenv.cross.config}-ar";
+    AR = "${stdenv.cross.config}-ar";
-     LD = "${stdenv.cross.config}-ld";
+    LD = "${stdenv.cross.config}-ld";
-     CC = "${stdenv.cross.config}-gcc";
+    CC = "${stdenv.cross.config}-gcc";
-     CXX = "${stdenv.cross.config}-gcc";
+    CXX = "${stdenv.cross.config}-gcc";
-     AR_FOR_TARGET = "${stdenv.cross.config}-ar";
+    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-     LD_FOR_TARGET = "${stdenv.cross.config}-ld";
+    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-     CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
+    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-     NM_FOR_TARGET = "${stdenv.cross.config}-nm";
+    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-     CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
-     # If we are making a cross compiler, cross != null
+    # If we are making a cross compiler, cross != null
-     NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";
+    NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";
-     dontStrip = true;
+    dontStrip = true;
-     configureFlags = "
+    configureFlags = ''
-       ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableMultilib then "" else "--disable-multilib"}
-       ${if enableShared then "" else "--disable-shared"}
+      ${if enableShared then "" else "--disable-shared"}
-       ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
+      ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
-       ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""}
+      ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""}
-       ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
+      ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
-       ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
-       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
-       --with-gmp=${gmp.hostDrv}
+      --with-gmp=${gmp.hostDrv}
-       --with-mpfr=${mpfr.hostDrv}
+      --with-mpfr=${mpfr.hostDrv}
-       --disable-libstdcxx-pch
+      --disable-libstdcxx-pch
-       --without-included-gettext
+      --without-included-gettext
-       --with-system-zlib
+      --with-system-zlib
-       --enable-languages=${
+      --enable-languages=${
-         concatStrings (intersperse ","
+        concatStrings (intersperse ","
-           (  optional langC        "c"
+          (  optional langC        "c"
-           ++ optional langCC       "c++"
+          ++ optional langCC       "c++"
-           ++ optional langFortran  "fortran"
+          ++ optional langFortran  "fortran"
-           ++ optional langJava     "java"
+          ++ optional langJava     "java"
-           ++ optional langTreelang "treelang"
+          ++ optional langTreelang "treelang"
-           ++ optional langAda      "ada"
+          ++ optional langAda      "ada"
-           ++ optional langVhdl     "vhdl"
+          ++ optional langVhdl     "vhdl"
-           )
+          )
-         )
+        )
-       }
+      }
-       ${if langAda then " --enable-libada" else ""}
+      ${if langAda then " --enable-libada" else ""}
-       ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
+      ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
-       ${if cross != null then crossConfigureFlags else ""}
+      ${if cross != null then crossConfigureFlags else ""}
-       --target=${stdenv.cross.config}
+      --target=${stdenv.cross.config}
-     ";
+    '';
-   };
+  };
  
 
   # Needed for the cross compilation to work
@@ -368,11 +369,13 @@ stdenv.mkDerivation ({
     platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
   };
 }
-// (if cross != null && cross.libc == "msvcrt" && crossStageStatic then rec {
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
-} else {})
+}
-// (if langVhdl then rec {
+
+// optionalAttrs langVhdl rec {
   name = "ghdl-0.29";
 
   ghdlSrc = fetchurl {
@@ -405,4 +408,4 @@ stdenv.mkDerivation ({
     platforms = with stdenv.lib.platforms; linux;
   };
 
-} else {}))
+})

pkgs/development/libraries/cloog-ppl/default.nix

@@ -1,13 +1,16 @@
 { fetchurl, stdenv, ppl, static ? false }:
 
-
 let
-    # --with-host-libstdcxx helps when *ppl* is built statically.
+
-    # But I will suppose that this is statically built only when ppl is also
+  # --with-host-libstdcxx helps when *ppl* is built statically.
-    # statically built.
+  # But I will suppose that this is statically built only when ppl is also
-    staticFlags = assert static -> ppl.dontDisableStatic == true;
+  # statically built.
-        if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else "";
+  staticFlags =
+    assert static -> ppl.dontDisableStatic == true;
+    if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else "";
+    
 in
+
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.9";
 
@@ -22,7 +25,7 @@ stdenv.mkDerivation rec {
   dontDisableStatic = if static then true else false;
 
   crossAttrs = {
-      configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags;
+    configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags;
   };
 
   doCheck = true;