From 1d73e9798c7f8eec80b227ef75cf47b02b99757d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 26 Jul 2022 08:25:00 +1000 Subject: [PATCH] zig: use `darwin.apple_sdk_11_0.callPackage` no need for the if else, `darwin.apple_sdk_11_0.callPackage` is a no op for non-darwin --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45f27c13f7f6..aef153662df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21785,8 +21785,8 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; - zig = callPackage ../development/compilers/zig { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + # requires a newer Apple SDK + zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { llvmPackages = llvmPackages_13; };