Unverified Commit 827846a2 authored by Emily's avatar Emily Committed by GitHub
Browse files

{apple-sdk,makeDarwinBundle}: fix `lib.generators.toPlist` calls for deprecation (#425943)

parents caea8a1c 47774411

pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
}:



let

  pListText = lib.generators.toPlist { } {

  pListText = lib.generators.toPlist { escape = true; } {

    CFBundleDevelopmentRegion = "English";

    CFBundleExecutable = "$name";

    CFBundleIconFile = "$icon";

pkgs/by-name/ap/apple-sdk/common/plists.nix

+13 −5
Original line number Diff line number Diff line
@@ -299,9 +299,17 @@ let 
  };

in

{

  "Info.plist" = builtins.toFile "Info.plist" (toPlist { } Info);

  "ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" (toPlist { } ToolchainInfo);

  "Architectures.xcspec" = builtins.toFile "Architectures.xcspec" (toPlist { } Architectures);

  "PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" (toPlist { } PackageTypes);

  "ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" (toPlist { } ProductTypes);

  "Info.plist" = builtins.toFile "Info.plist" (toPlist { escape = true; } Info);

  "ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" (

    toPlist { escape = true; } ToolchainInfo

  );

  "Architectures.xcspec" = builtins.toFile "Architectures.xcspec" (

    toPlist { escape = true; } Architectures

  );

  "PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" (

    toPlist { escape = true; } PackageTypes

  );

  "ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" (

    toPlist { escape = true; } ProductTypes

  );

}