nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76582 from LnL7/darwin-remove-cf-references

Browse Source 
darwin.cf-private: remove references
This commit is contained in:
Domen Kožar 2019-12-28 19:53:05 +01:00 committed by GitHub
commit 0f85c5bc5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/misc/lorri/default.nix
View File

@ -10,7 +10,6 @@
# Apple dependencies # Apple dependencies
, CoreServices , CoreServices
, Security , Security
, cf-private
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -40,7 +39,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = with pkgs; [ nix direnv which ]; nativeBuildInputs = with pkgs; [ nix direnv which ];
buildInputs = buildInputs =
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ]; stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
passthru = { passthru = {
updater = with builtins; writeScript "copy-runtime-nix.sh" '' updater = with builtins; writeScript "copy-runtime-nix.sh" ''

2
pkgs/tools/system/plan9port/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation {
xorgproto libX11 libXext libXt fontconfig xorgproto libX11 libXext libXt fontconfig
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ 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; builder = ./builder.sh;

1
pkgs/top-level/all-packages.nix
View File

@ -8528,7 +8528,6 @@ in
llvmPackages_latest = llvmPackages_9; llvmPackages_latest = llvmPackages_9;
lorri = callPackage ../tools/misc/lorri { lorri = callPackage ../tools/misc/lorri {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) CoreServices Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}; };