From db63f9358fdcf7faa52f2bcf08b11aa7cb420b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Fri, 29 Sep 2023 07:40:14 +0200 Subject: [PATCH] eza: use by-name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- .../misc/eza/default.nix => by-name/ez/eza/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/eza/default.nix => by-name/ez/eza/package.nix} (95%) diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/by-name/ez/eza/package.nix similarity index 95% rename from pkgs/tools/misc/eza/default.nix rename to pkgs/by-name/ez/eza/package.nix index e675cd1b7608..52d7ad5bc804 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -7,7 +7,7 @@ , pandoc , pkg-config , zlib -, Security +, darwin , libiconv , installShellFiles # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449d836683ae..ef389461c994 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8037,10 +8037,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - eza = callPackage ../tools/misc/eza { - inherit (darwin.apple_sdk.frameworks) Security; - }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric;