Merge pull request #229314 from ConnorBaker/fix/apple-sdk-remove-cf-private (9433be14) · Commits · nix / nixpkgs

pkgs/development/compilers/lobster/default.nix

+2 −3

Original line number	Diff line number	Diff line
		{ 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

+1 −2

Original line number	Diff line number	Diff line
		@@ -15528,9 +15528,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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 { };

+0 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@ let
		perlPackages = { };

		darwin = packagePlatforms pkgs.darwin // {
		cf-private = {};
		xcode = {};
		};
		} ));