diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
commit | d2e147bedf251976ed99b94b6c905d6761f7a892 (patch) | |
tree | 9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/development/compilers/gcc/9/default.nix | |
parent | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff) | |
parent | c464dc811babfe316ed4ab7bbc12351122e69dd7 (diff) | |
download | nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2 nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/development/compilers/gcc/9/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 857263e51e0..43b2e0b5ef5 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -170,7 +170,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -191,7 +193,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; |