public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc: Homogenize syntax in one small spot

Browse Source 
Less noise in the diff help maintain these behemoths.
This commit is contained in:
John Ericson
2017-08-18 10:54:22 -04:00
parent 7320fa9d45
commit b11889e6a4
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/gcc/4.5/default.nix
View File

@@ -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 ([]

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@@ -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 ([]

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@@ -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 ([]

2
pkgs/development/compilers/gcc/5/default.nix
View File

@@ -491,7 +491,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 ([]

2
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -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 ([]

2
pkgs/development/compilers/gcc/7/default.nix
View File

@@ -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 ([]

2
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@@ -470,7 +470,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 ([]