b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gcc10StdenvCompat: fix the intended logic

Browse source 
See commit 8bdc1401a2 from PR #175177

arc_unpacker has already been fixed not to need the override.
Maybe also in other cases this isn't useful anymore,
but at least the attribute makes some sense again.
This commit is contained in:
Vladimír Čunát 2023-02-05 09:51:21 +01:00
parent cb231fb28d
commit dc1638927e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View file

@ -1244,7 +1244,6 @@ with pkgs;
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
boost = boost16x; # checkPhase fails with Boost 1.77
stdenv = gcc10StdenvCompat;
};
adminer = callPackage ../servers/adminer { };
@ -14309,7 +14308,8 @@ with pkgs;
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv;
# Meant for packages that fail with newer than gcc10.
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv;
# This is not intended for use in nixpkgs but for providing a faster-running
# compiler to nixpkgs users by building gcc with reproducibility-breaking