Unverified Commit a268f6ff authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234691 from wegank/darwin-clangstdenv 

darwin.apple_sdk_11_0: deprecate clang*Stdenv
parents e2856d0f 588f16c9

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

+1 −1
Original line number Diff line number Diff line 
{ 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";

pkgs/os-specific/darwin/apple-sdk-11.0/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -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" ]

  );

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };