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

exa: remove darwin from input

Browse Source
This commit is contained in:
Sandro Jäckel 2021-02-12 05:18:07 +01:00
parent a1cfe2a07e
commit a50abe418f
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/exa/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib
, darwin, libiconv, installShellFiles , Security, libiconv, installShellFiles
}: }:
with rustPlatform; with rustPlatform;
@ -28,9 +28,7 @@ buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; nativeBuildInputs = [ cmake pkg-config perl installShellFiles ];
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
libiconv darwin.apple_sdk.frameworks.Security ]
;
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

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

@ -3993,7 +3993,9 @@ in
eva = callPackage ../tools/misc/eva { }; 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 { exempi = callPackage ../development/libraries/exempi {
stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;