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 14:03:48 -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
pkgs/development/compilers/gcc/4.5/default.nix
+1 -2
View File
@@ -344,8 +344,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
hasAttr "propagatedBuildInputs" libcCross)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/4.8/default.nix
+1 -1
View File
@@ -467,7 +467,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/4.9/default.nix
+1 -1
View File
@@ -473,7 +473,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/5/default.nix
+1 -1
View File
@@ -491,7 +491,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/6/default.nix
+1 -1
View File
@@ -481,7 +481,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/7/default.nix
+1 -1
View File
@@ -483,7 +483,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]
pkgs/development/compilers/gcc/snapshot/default.nix
+1 -1
View File
@@ -470,7 +470,7 @@ stdenv.mkDerivation ({
# On GNU/Hurd glibc refers to Mach & Hurd # On GNU/Hurd glibc refers to Mach & Hurd
# headers. # headers.
++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
libcCross.propagatedBuildInputs); libcCross.propagatedBuildInputs);
LIBRARY_PATH = makeLibraryPath ([] LIBRARY_PATH = makeLibraryPath ([]