diff options
| author | Connor Baker <connor.baker@tweag.io> | 2023-05-01 11:45:15 -0400 |
|---|---|---|
| committer | Connor Baker <connor.baker@tweag.io> | 2023-05-01 21:59:03 -0400 |
| commit | b2eb5c816f6eb5f3ce959b11c60f68e4d4264a8f (patch) | |
| tree | e23e29523123cf92667c603df05c243bd48a8606 | |
| parent | b00a5321bb61a745357ee2f8107e91369cc392db (diff) | |
apple_sdk: remove cf-private alias
| -rw-r--r-- | pkgs/development/compilers/lobster/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 98a3c18386d5f..6bee313e36779 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, unstableGitUpdater , cmake , callPackage @@ -9,7 +8,7 @@ , xorg # Darwin deps -, cf-private +, CoreFoundation , Cocoa , AudioToolbox , OpenGL @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = if stdenv.isDarwin then [ - cf-private + CoreFoundation Cocoa AudioToolbox OpenGL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc7d6e1c42bbf..d03dccd5044d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15523,9 +15523,8 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; lobster = callPackage ../development/compilers/lobster { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) - Cocoa AudioToolbox OpenGL Foundation ForceFeedback; + CoreFoundation Cocoa AudioToolbox OpenGL Foundation ForceFeedback; }; lld = llvmPackages.lld; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 732b0404040eb..b6e70772d04a2 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -108,7 +108,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; }; - # TODO: remove alias. + # TODO(@connorbaker): See https://github.com/NixOS/nixpkgs/issues/229389. cf-private = self.apple_sdk.frameworks.CoreFoundation; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ba6b4ea4e386a..8888371aa062a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -217,7 +217,6 @@ let perlPackages = { }; darwin = packagePlatforms pkgs.darwin // { - cf-private = {}; xcode = {}; }; } )); |