apple_sdk: remove cf-private alias
This commit is contained in:
parent
b00a5321bb
commit
b2eb5c816f
|
@ -1,6 +1,5 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, unstableGitUpdater
|
|
||||||
, cmake
|
, cmake
|
||||||
, callPackage
|
, callPackage
|
||||||
|
|
||||||
|
@ -9,7 +8,7 @@
|
||||||
, xorg
|
, xorg
|
||||||
|
|
||||||
# Darwin deps
|
# Darwin deps
|
||||||
, cf-private
|
, CoreFoundation
|
||||||
, Cocoa
|
, Cocoa
|
||||||
, AudioToolbox
|
, AudioToolbox
|
||||||
, OpenGL
|
, OpenGL
|
||||||
|
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = if stdenv.isDarwin
|
buildInputs = if stdenv.isDarwin
|
||||||
then [
|
then [
|
||||||
cf-private
|
CoreFoundation
|
||||||
Cocoa
|
Cocoa
|
||||||
AudioToolbox
|
AudioToolbox
|
||||||
OpenGL
|
OpenGL
|
||||||
|
|
|
@ -15523,9 +15523,8 @@ with pkgs;
|
||||||
lizardfs = callPackage ../tools/filesystems/lizardfs { };
|
lizardfs = callPackage ../tools/filesystems/lizardfs { };
|
||||||
|
|
||||||
lobster = callPackage ../development/compilers/lobster {
|
lobster = callPackage ../development/compilers/lobster {
|
||||||
inherit (darwin) cf-private;
|
|
||||||
inherit (darwin.apple_sdk.frameworks)
|
inherit (darwin.apple_sdk.frameworks)
|
||||||
Cocoa AudioToolbox OpenGL Foundation ForceFeedback;
|
CoreFoundation Cocoa AudioToolbox OpenGL Foundation ForceFeedback;
|
||||||
};
|
};
|
||||||
|
|
||||||
lld = llvmPackages.lld;
|
lld = llvmPackages.lld;
|
||||||
|
|
|
@ -108,7 +108,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
|
||||||
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
|
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;
|
cf-private = self.apple_sdk.frameworks.CoreFoundation;
|
||||||
|
|
||||||
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
|
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
|
||||||
|
|
|
@ -217,7 +217,6 @@ let
|
||||||
perlPackages = { };
|
perlPackages = { };
|
||||||
|
|
||||||
darwin = packagePlatforms pkgs.darwin // {
|
darwin = packagePlatforms pkgs.darwin // {
|
||||||
cf-private = {};
|
|
||||||
xcode = {};
|
xcode = {};
|
||||||
};
|
};
|
||||||
} ));
|
} ));
|
||||||
|
|
Loading…
Reference in a new issue