about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristina Sørensen <christina@cafkafk.com>2023-09-29 07:40:14 +0200
committerChristina Sørensen <christina@cafkafk.com>2023-09-29 07:40:14 +0200
commitdb63f9358fdcf7faa52f2bcf08b11aa7cb420b78 (patch)
tree7093cd41a568b57065355888683fd65cafa8b03b
parent4919a8cdcc09e51bff39c047cfda13c2ec7d64cd (diff)
eza: use by-name
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
-rw-r--r--pkgs/by-name/ez/eza/package.nix (renamed from pkgs/tools/misc/eza/default.nix)4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/by-name/ez/eza/package.nix
index e675cd1b76083..52d7ad5bc8048 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 449d836683aec..ef389461c9943 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;