mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge pull request #294476 from trofi/drop-disable-warnings-if-gcc13
disable-warnings-if-gcc13: drop unused `disable-warnings-if-gcc13` he…
This commit is contained in:
@@ -15707,15 +15707,6 @@ with pkgs;
|
||||
gccFun = callPackage ../development/compilers/gcc;
|
||||
gcc-unwrapped = gcc.cc;
|
||||
|
||||
disable-warnings-if-gcc13 = pkg:
|
||||
if (pkg.stdenv.cc.cc.isGNU or false && lib.versionAtLeast pkg.stdenv.cc.cc.version "13.0")
|
||||
then pkg.overrideAttrs(previousAttrs: previousAttrs // {
|
||||
env = previousAttrs.env or {} // {
|
||||
NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + " -Wno-error";
|
||||
};
|
||||
})
|
||||
else pkg;
|
||||
|
||||
pin-to-gcc12-if-gcc13 = pkg:
|
||||
if !(lib.isDerivation pkg) || !(pkg?override) then pkg else
|
||||
pkg.override (previousArgs:
|
||||
|
||||
Reference in New Issue
Block a user