diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-12 21:16:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 21:16:00 +0100 |
| commit | ecf06378f7caba04a1018509d04e23cfbd5635ff (patch) | |
| tree | a2e27da387d1f76df138eb21189c336649e2a072 /pkgs/top-level | |
| parent | 29ec4bb3ab38ac0229213197471133770702140e (diff) | |
| parent | 024fa9bd403bb0358f58d2bdbceac5d140faa746 (diff) | |
| download | nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar.gz nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar.bz2 nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar.lz nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar.xz nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.tar.zst nixpkgs-ecf06378f7caba04a1018509d04e23cfbd5635ff.zip | |
Merge pull request #112855 from SuperSandro2000/fix-collection10
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20cca4406f..698ec43fcdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1333,7 +1333,9 @@ in gremlin-console = callPackage ../applications/misc/gremlin-console { }; - grex = callPackage ../tools/misc/grex { }; + grex = callPackage ../tools/misc/grex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; @@ -3992,7 +3994,9 @@ in 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 { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; @@ -8379,7 +8383,9 @@ in toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { }; + tokei = callPackage ../development/tools/misc/tokei { + inherit (darwin.apple_sdk.frameworks) Security; + }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ad8375760b..17f6624c42e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8489,7 +8489,9 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; - yq = callPackage ../development/python-modules/yq { }; + yq = callPackage ../development/python-modules/yq { + inherit (pkgs) jq; + }; yt = callPackage ../development/python-modules/yt { }; |