Commit b11889e6 authored by John Ericson's avatar John Ericson
Browse files

gcc: Homogenize syntax in one small spot 

Less noise in the diff help maintain these behemoths.
parent 7320fa9d

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

+1 −2
Original line number Diff line number Diff line
@@ -344,8 +344,7 @@ stdenv.mkDerivation ({ 


    # On GNU/Hurd glibc refers to Mach & Hurd

    # headers.

    ++ optionals (libcCross != null &&

                  hasAttr "propagatedBuildInputs" libcCross)

    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

                 libcCross.propagatedBuildInputs);



  LIBRARY_PATH = makeLibraryPath ([]

pkgs/development/compilers/gcc/4.8/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ stdenv.mkDerivation ({ 


    # On GNU/Hurd glibc refers to Mach & Hurd

    # headers.

    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )

    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

                 libcCross.propagatedBuildInputs);



  LIBRARY_PATH = makeLibraryPath ([]

pkgs/development/compilers/gcc/4.9/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ stdenv.mkDerivation ({ 


    # On GNU/Hurd glibc refers to Mach & Hurd

    # headers.

    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )

    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

                 libcCross.propagatedBuildInputs);



  LIBRARY_PATH = makeLibraryPath ([]

pkgs/development/compilers/gcc/6/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ stdenv.mkDerivation ({ 


    # On GNU/Hurd glibc refers to Mach & Hurd

    # headers.

    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")

    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

                 libcCross.propagatedBuildInputs);



  LIBRARY_PATH = makeLibraryPath ([]

pkgs/development/compilers/gcc/7/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ stdenv.mkDerivation ({ 


    # On GNU/Hurd glibc refers to Mach & Hurd

    # headers.

    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")

    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)

                 libcCross.propagatedBuildInputs);



  LIBRARY_PATH = makeLibraryPath ([]