darwin-packages: avoid exporting attributes that don't exist

NixOS · Apr 28, 2021 · 6fe3a10 · 6fe3a10
1 parent 50ef311
commit 6fe3a10
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
@@ -24,13 +24,18 @@ let
   # SDK.
   useAppleSDKLibs = stdenv.hostPlatform.isAarch64;
 
-  chooseLibs = {
-    inherit (
+  selectAttrs = attrs: names:
+    lib.listToAttrs (lib.concatMap (n: if attrs ? "${n}" then [(lib.nameValuePair n attrs."${n}")] else []) names);
+
+  chooseLibs = (
+    # There are differences in which libraries are exported. Avoid evaluation
+    # errors when a package is not provided.
+    selectAttrs (
       if useAppleSDKLibs
         then apple_sdk
         else appleSourcePackages
-    ) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit;
-
+    ) ["Libsystem" "LibsystemCross" "libcharset" "libunwind" "objc4" "configd" "IOKit"]
+  ) // {
     inherit (
       if useAppleSDKLibs
         then apple_sdk.frameworks