summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/9
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2022-08-17 20:43:58 +0300
committerArtturin <Artturin@artturin.com>2022-08-17 21:03:40 +0300
commitf16be229dcb9e3bb914820ed0f74a0009b0235dc (patch)
treef16e2c8aa1e41573a1ba6274bc332ea0eafbe6fd /pkgs/development/compilers/gcc/9
parentb6e4fd1a2be6234f66a452e54adef956993a35a9 (diff)
downloadnixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar.gz
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar.bz2
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar.lz
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar.xz
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.tar.zst
nixpkgs-f16be229dcb9e3bb914820ed0f74a0009b0235dc.zip
gcc/: correct gnused conditionals and move to nativeBuildInputs
hostPlatform changes were done in commits like https://github.com/nixos/nixpkgs/commit/7a134572532323900a6661e5f1fea09b6dea3479

it should have been buildPlatform instead according to the comment
Diffstat (limited to 'pkgs/development/compilers/gcc/9')
-rw-r--r--pkgs/development/compilers/gcc/9/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 707ead542f0..cb524e99fbd 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -38,7 +38,7 @@
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.hostPlatform.isDarwin -> gnused != null;
+assert stdenv.buildPlatform.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -161,6 +161,9 @@ stdenv.mkDerivation ({
   nativeBuildInputs = [ texinfo which gettext ]
     ++ (optional (perl != null) perl)
     ++ (optional langAda gnatboot)
+    # 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 buildPlatform.isDarwin gnused)
     ;
 
   # For building runtime libs
@@ -179,9 +182,6 @@ stdenv.mkDerivation ({
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ] ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
-    # 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)
     ;
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;