nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc: 15.3.0 -> 15.2.0 on i686-linux

Browse Source 
This fixes a build issue in pkgsi686Linux.mbedtls
I don't feel like digging deep for i686-linux on NixOS 26.05.
This commit is contained in:
Vladimír Čunát
2026-09-18 12:00:53 +02:00
parent cb97bc9172
commit f7cc8a2263
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/all.nix
View File

@@ -12,7 +12,7 @@
}:
let
versions = import ./versions.nix;
versions = import ./versions.nix { inherit stdenv; };
buildIsHost = lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform;
buildIsTarget = lib.systems.equals stdenv.buildPlatform stdenv.targetPlatform;
hostIsTarget = lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform;

2
pkgs/development/compilers/gcc/default.nix
View File

@@ -78,7 +78,7 @@ let
inherit (_systemInfo) buildIsHost hostIsTarget;
gccVersions = import ./versions.nix;
gccVersions = import ./versions.nix { inherit stdenv; };
version = gccVersions.fromMajorMinor majorMinorVersion;
majorVersion = versions.major version;

4
pkgs/development/compilers/gcc/versions.nix
View File

@@ -1,7 +1,8 @@
{ stdenv }:
let
majorMinorToVersionMap = {
"16" = "16.2.0";
"15" = "15.3.0";
"15" = if stdenv.hostPlatform.isi686 then "15.2.0" else "15.3.0";
"14" = "14.4.0";
"13" = "13.4.0";
};
@@ -16,6 +17,7 @@ let
# 4 digits: snapshots (14.2.1.20250322)
"16.2.0" = "sha256-5nOOKVl/czJwcxqpBgDzf/3ARQed/CfsfoGSzIEIXD4=";
"15.3.0" = "sha256-+lnBvu+JlfJ8TXHB3yJ1hxiTFdPm+v8btDBuYbDFMOs=";
"15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4=";
"14.4.0" = "sha256-dStvVnvqyDFZx3p2gLExa914Rzi/+anQcBEsCdqQ9tk=";
"13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
}