From 7fafd45ad758fcb3d24b1da38039c4e73d5d8902 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 27 Dec 2019 18:33:52 +0100 Subject: [PATCH 1/2] lorri: remove cf-private No longer needded since #63381. --- pkgs/tools/misc/lorri/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 914578c47ec9..8be6cf5a8a3b 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -10,7 +10,6 @@ # Apple dependencies , CoreServices , Security -, cf-private }: rustPlatform.buildRustPackage rec { @@ -40,7 +39,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ nix direnv which ]; buildInputs = - stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ]; + stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; passthru = { updater = with builtins; writeScript "copy-runtime-nix.sh" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ca9847cd87..cdfa2f2e92c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8522,7 +8522,6 @@ in llvmPackages_latest = llvmPackages_9; lorri = callPackage ../tools/misc/lorri { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; From 1de5065375f2b09a346087c06a8671f68c3cd025 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 27 Dec 2019 18:36:03 +0100 Subject: [PATCH 2/2] plan9port: remove cf-private No longer needed since #63381. --- pkgs/tools/system/plan9port/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9776960327e1..9a4a22385584 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - darwin.cf-private Carbon Cocoa IOKit Metal QuartzCore + Carbon Cocoa IOKit Metal QuartzCore ]); builder = ./builder.sh;