diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index d743655d1eba..8b6d97d3bcae 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -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: + # * + # * + # * + (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit))) + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch new file mode 100644 index 000000000000..3f18f07d4012 --- /dev/null +++ b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch @@ -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 ++ + namespace juce + { + diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 75da391e7914..b9f5a5eb3a3a 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -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 diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c45eca79a9fe..eea03058f352 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -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 - } ) ) ); diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 4acd72081967..ac78505923ac 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -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; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 36435d58ff42..0e59e542ae4d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 413c9d330f41..10eb1c12d1ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cd74042a1f0..897ed22dd676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; } );