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

llvmPackages: llvmPackages_{16,18} -> llvmPackages_19 (#354107)

parents fe909b39 268c6e4f

pkgs/applications/networking/browsers/firefox/common.nix

+19 −0
Original line number Diff line number Diff line
@@ -254,6 +254,25 @@ buildStdenv.mkDerivation { 
      hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";

    })

  ]

  ++ [

    # LLVM 19 turned on WASM reference types by default, exposing a bug

    # that broke the Mozilla WASI build. Supposedly, it has been fixed

    # upstream in LLVM, but the build fails in the same way for us even

    # with LLVM 19 versions that contain the upstream patch.

    #

    # Apply the temporary patch Mozilla used to work around this bug

    # for now until someone can investigate what’s going on here.

    #

    # TODO: Please someone figure out what’s up with this.

    #

    # See: <https://bugzilla.mozilla.org/show_bug.cgi?id=1905251>

    # See: <https://github.com/llvm/llvm-project/pull/97451>

    (fetchpatch {

      name = "wasi-sdk-disable-reference-types.patch";

      url = "https://hg.mozilla.org/integration/autoland/raw-rev/23a9f6555c7c";

      hash = "sha256-CRywalJlRMFVLITEYXxpSq3jLPbUlWKNRHuKLwXqQfU=";

    })

  ]

  ++ extraPatches;



  postPatch = ''

pkgs/build-support/bintools-wrapper/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation { 
      done

    ''



    + optionalString targetPlatform.isDarwin ''

      echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags

    ''



    ##

    ## GNU specific extra strip flags

    ##

pkgs/build-support/cc-wrapper/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -696,10 +696,6 @@ stdenvNoCC.mkDerivation { 
      done

    ''



    + optionalString targetPlatform.isDarwin ''

        echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags

    ''



    + optionalString targetPlatform.isAndroid ''

      echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags

    ''

pkgs/by-name/gs/gss/package.nix

+4 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, autoreconfHook

, gtk-doc

, withShishi ? !stdenv.hostPlatform.isDarwin

, shishi

}:
@@ -20,6 +22,8 @@ stdenv.mkDerivation rec { 
    rm tests/krb5context.c

  '';



  nativeBuildInputs = [ autoreconfHook gtk-doc ];



  buildInputs = lib.optional withShishi shishi;



  # ./stdint.h:89:5: error: expected value in expression

pkgs/by-name/mj/mjpegtools/package.nix

+9 −3
Original line number Diff line number Diff line
@@ -16,9 +16,15 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-sYBTbX2ZYLBeACOhl7ANyxAJKaSaq3HRnVX0obIQ9Jo=";

  };



  # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17, and the

  # `register` type class specifier is no longer allowed.

  patches = [ ./c++-17-fixes.patch ];

  patches = [

    # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17,

    # and the `register` type class specifier is no longer allowed.

    ./c++-17-fixes.patch



    # Clang-19 errors out for dead code (in header) which accesses undefined

    # class members

    ./remove-subtract-and-union-debug.diff

  ];



  hardeningDisable = [ "format" ];