Merge pull request #234691 from wegank/darwin-clangstdenv

darwin.apple_sdk_11_0: deprecate clang*Stdenv

Changed files
+8 -3
pkgs
applications
networking
instant-messengers
signalbackup-tools
os-specific
darwin
apple-sdk-11.0
top-level
+1 -1
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
···
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:
-
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
+
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230523";
+6 -1
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
···
stdenvs = {
stdenv = mkStdenv stdenv;
} // builtins.listToAttrs (map
-
(v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; })
+
(v: {
+
name = "llvmPackages_${v}";
+
value = pkgs."llvmPackages_${v}" // {
+
stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
+
};
+
})
[ "12" "13" "14" "15" "16" ]
);
+1 -1
pkgs/top-level/all-packages.nix
···
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
-
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv;
+
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;
lazpaint = callPackage ../applications/graphics/lazpaint { };