From 0bc275e63423456d6deb650e146120c39c1e0723 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 22 Jan 2021 14:07:06 -0800
Subject: Revert "lib: Clean up how linux and gcc config is specified"

This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
---
 pkgs/development/compilers/julia/1.0.nix | 2 +-
 pkgs/development/compilers/julia/1.3.nix | 2 +-
 pkgs/development/compilers/julia/1.5.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/compilers/julia')

diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 78f7c2ef1b91c..0325632ad0ab9 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     let
       arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 2a270b7c72c18..8096af0b320c2 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index 778a9c3a9d796..be3cfc39635c7 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
-- 
cgit 1.4.1