From 0aaf5768e5f664d6bbbe421bccf125e2316b246c Mon Sep 17 00:00:00 2001 From: Steven Sherry Date: Wed, 29 Dec 2021 17:13:02 -0600 Subject: btop: Remove gcc11 as a nativeBuildInput for darwin since gcc11Stdenv is already set in all-packages.nix --- pkgs/tools/system/btop/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/system/btop') diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 2c1534976dacb..70b1a78586cf7 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , runCommand , darwin -, gcc11 }: stdenv.mkDerivation rec { @@ -17,13 +16,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-uKR1ogQwEoyxyWBiLnW8BsOsYgTpeIpKrKspq0JwYjY="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ gcc11 ]; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - ADDFLAGS = with darwin.apple_sdk; + ADDFLAGS = with darwin.apple_sdk.frameworks; lib.optional stdenv.isDarwin - "-F${frameworks.IOKit}/Library/Frameworks/"; + "-F${IOKit}/Library/Frameworks/"; buildInputs = with darwin.apple_sdk; lib.optionals stdenv.isDarwin [ -- cgit 1.4.1