From a50abe418fb7293119172cfa76354e5221256dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Feb 2021 05:18:07 +0100 Subject: [PATCH] exa: remove darwin from input --- pkgs/tools/misc/exa/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 83aa6c505d32..f275d254677c 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib -, darwin, libiconv, installShellFiles +, Security, libiconv, installShellFiles }: with rustPlatform; @@ -28,9 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6135e02d1dbe..01911f573099 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3993,7 +3993,9 @@ in eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { }; + exa = callPackage ../tools/misc/exa { + inherit (darwin.apple_sdk.frameworks) Security; + }; exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;