gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various: unpin old GCCs (#434139)

Browse Source
This commit is contained in:
Emily
2025-08-17 16:45:05 +01:00
committed by GitHub
parent 64a6e040a5 177adfa166
commit 2ad04a3518
8 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/am/amdvlk/package.nix
+14
View File
@@ -85,6 +85,20 @@ stdenv.mkDerivation (finalAttrs: {
cmakeDir = "../drivers/xgl";
cmakeFlags = [
# There is some incredibly cursed issue with
# `directx-shader-compiler` flagging up compiler errors only on
# `i686-linux` and only when it has been compiled with a recent
# GCC. Since few 32‐bit games are going to use ray tracing anyway,
# we just disable it for now. Arch has done this since 2022.
#
# See:
# * <https://github.com/NixOS/nixpkgs/issues/216294>
# * <https://github.com/GPUOpen-Drivers/gpurt/issues/5>
# * <https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-amdvlk/-/commit/905d9bc2cf4a003b3d367537b5e120d9771cce16>
(lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit)))
];
installPhase = ''
runHook preInstall
pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch
+14
View File
@@ -0,0 +1,14 @@
Submodule Plugin/modules/JUCE contains modified content
diff --git a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
index 06c0a729d..119f146b8 100644
--- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
+++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
@@ -23,6 +23,8 @@
==============================================================================
*/
+#include <utility>
+
namespace juce
{
pkgs/by-name/ch/chow-tape-model/package.nix
+6 -6
View File
@@ -32,14 +32,9 @@
pkg-config,
python3,
sqlite,
gcc11Stdenv,
stdenv,
webkitgtk_4_0,
}:
let
# JUCE version in submodules is incompatible with GCC12
# See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2
stdenv = gcc11Stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "chow-tape-model";
version = "2.11.4";
@@ -52,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
patches = [
# Fix the old JUCE submodule for GCC ≥ 12
./fix-juce-gcc-12.patch
];
nativeBuildInputs = [
pkg-config
cmake
pkgs/development/compilers/llvm/default.nix
-8
View File
@@ -5,7 +5,6 @@
buildPackages,
targetPackages,
stdenv,
gcc12Stdenv,
pkgs,
recurseIntoAttrs,
# This is the default binutils, but with *this* version of LLD rather
@@ -81,13 +80,6 @@ let
;
}
// packageSetArgs # Allow overrides.
// {
stdenv =
if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then
gcc12Stdenv
else
stdenv; # does not build with gcc13
}
)
)
);
pkgs/development/interpreters/falcon/default.nix
+4 -7
View File
@@ -11,19 +11,15 @@
stdenv.mkDerivation {
pname = "falcon";
version = "unstable-2018-10-23";
version = "0-unstable-2023-11-19";
src = fetchFromGitHub {
owner = "falconpl";
repo = "falcon";
rev = "637e2d5cd950a874496042993c02ab7d17c1b688";
sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg=";
rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808";
hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs=";
};
# -Wnarrowing is enabled by default in recent GCC versions,
# causing compilation to fail.
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
nativeBuildInputs = [
cmake
pkg-config
@@ -39,5 +35,6 @@ stdenv.mkDerivation {
license = licenses.gpl2Only;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; unix;
broken = stdenv.cc.isClang;
};
}
pkgs/tools/typesetting/tex/texlive/default.nix
+1 -5
View File
@@ -5,8 +5,7 @@
*/
{
lib,
#, stdenv
gcc12Stdenv,
stdenv,
fetchpatch,
fetchurl,
runCommand,
@@ -45,9 +44,6 @@
recurseIntoAttrs,
nixfmt,
}:
let
stdenv = gcc12Stdenv;
in
let
# various binaries (compiled)
bin = callPackage ./bin.nix {
pkgs/top-level/all-packages.nix
+3 -23
View File
@@ -2740,15 +2740,6 @@ with pkgs;
diffutils = callPackage ../tools/text/diffutils { };
dmd = callPackage ../by-name/dm/dmd/package.nix (
{
}
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
# https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123
stdenv = gcc11Stdenv;
}
);
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
@@ -5466,9 +5457,7 @@ with pkgs;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
falcon = callPackage ../development/interpreters/falcon {
stdenv = gcc10Stdenv;
};
falcon = callPackage ../development/interpreters/falcon { };
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { });
@@ -6795,13 +6784,7 @@ with pkgs;
inherit (darwin) sigtool;
buildJdk = jdk11_headless;
runJdk = jdk11_headless;
stdenv =
if stdenv.cc.isClang then
llvmPackages_17.stdenv
else if stdenv.cc.isGNU then
gcc12Stdenv
else
stdenv;
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;
bazel_self = bazel_6;
};
@@ -10007,10 +9990,7 @@ with pkgs;
diod = callPackage ../servers/diod { lua = lua5_1; };
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
# https://github.com/NixOS/nixpkgs/issues/216294
stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv;
};
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { };
dodgy = with python3Packages; toPythonApplication dodgy;
pkgs/top-level/python-packages.nix
+1 -1
View File
@@ -7253,7 +7253,7 @@ self: super: with self; {
enablePython = true;
enableRtk = false;
stdenv =
if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv;
if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc13Stdenv else stdenv;
}
);