JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #257975 from cafkafk/cafk-eza-by-name

Browse Source 
eza: use by-name
This commit is contained in:
Weijia Wang 2023-09-29 08:40:59 +02:00 committed by GitHub
commit 7dc7b559be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/eza/default.nix → pkgs/by-name/ez/eza/package.nix
View File

@ -7,7 +7,7 @@
, pandoc , pandoc
, pkg-config , pkg-config
, zlib , zlib
, Security , darwin
, libiconv , libiconv
, installShellFiles , installShellFiles
# once eza upstream gets support for setting up a compatibilty symlink for exa, we should change # 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 ]; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ]; ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
buildNoDefaultFeatures = true; buildNoDefaultFeatures = true;
buildFeatures = lib.optional gitSupport "git"; buildFeatures = lib.optional gitSupport "git";

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

@ -8041,10 +8041,6 @@ with pkgs;
expliot = callPackage ../tools/security/expliot { }; expliot = callPackage ../tools/security/expliot { };
eza = callPackage ../tools/misc/eza {
inherit (darwin.apple_sdk.frameworks) Security;
};
f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
Fabric = with python3Packages; toPythonApplication fabric; Fabric = with python3Packages; toPythonApplication fabric;