diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:01:16 +0000 |
| commit | a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243 (patch) | |
| tree | 4df0a4239ef144053e491b8904ec194dc8e57d3d /pkgs/development/compilers/gcc/6/default.nix | |
| parent | 86197a8023b233a84be08d43ac933688fcbd057e (diff) | |
| parent | d0796a6c6779bda9addfccc07f00565e8c9a897c (diff) | |
| download | nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.gz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.bz2 nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.lz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.xz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.zst nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 4567e8b43e9..df4a632db05 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -199,7 +199,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkg-config) - ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); + ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -222,7 +224,6 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; |