Unverified Commit 2ad04a35 authored by Emily's avatar Emily Committed by GitHub
Browse files

various: unpin old GCCs (#434139)

parents 64a6e040 177adfa1

pkgs/by-name/am/amdvlk/package.nix

+14 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line
@@ -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

+0 −8
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

  };

}