Merge pull request #234691 from wegank/darwin-clangstdenv

darwin.apple_sdk_11_0: deprecate clang*Stdenv

authored by Weijia Wang and committed by GitHub a268f6ff e2856d0f

+8 -3
+1 -1
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
··· 1 1 { lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }: 2 2 3 - (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { 3 + (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { 4 4 pname = "signalbackup-tools"; 5 5 version = "20230523"; 6 6
+6 -1
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
··· 71 71 stdenvs = { 72 72 stdenv = mkStdenv stdenv; 73 73 } // builtins.listToAttrs (map 74 - (v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; }) 74 + (v: { 75 + name = "llvmPackages_${v}"; 76 + value = pkgs."llvmPackages_${v}" // { 77 + stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv; 78 + }; 79 + }) 75 80 [ "12" "13" "14" "15" "16" ] 76 81 ); 77 82
+1 -1
pkgs/top-level/all-packages.nix
··· 32129 32129 ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; 32130 32130 32131 32131 ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { 32132 - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv; 32132 + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; 32133 32133 }; 32134 32134 32135 32135 lazpaint = callPackage ../applications/graphics/lazpaint { };