diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-29 10:23:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-29 10:23:43 +0300 |
| commit | a268f6ff1c3f264f3abff9485ca23ced5938b9b4 (patch) | |
| tree | f06a25af31bd433e799767f6b3c6129a0f39c28a | |
| parent | e2856d0fae31ae2e7a58692da9dcf14a481d1c05 (diff) | |
| parent | 588f16c917d580563159122f05b6ec0dd4f7f807 (diff) | |
Merge pull request #234691 from wegank/darwin-clangstdenv
darwin.apple_sdk_11_0: deprecate clang*Stdenv
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 0a667379d4c9d..93f9588f134ae 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,6 +1,6 @@ { 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"; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 2576d8bcafb7f..741c1a82f3475 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -71,7 +71,12 @@ let 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" ] ); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7527aef002ca..663105a3bcb1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32129,7 +32129,7 @@ with pkgs; 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 { }; |