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

Merge pull request #110493 from hackworthltd/nix-big-sur

Browse Source 
nix: add Security to build inputs.
This commit is contained in:
Eelco Dolstra 2021-01-22 16:16:12 +01:00 committed by GitHub
commit b60a6af8ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/nix/default.nix
View File

@ -3,6 +3,7 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, boehmgc , boehmgc
, Security
}: }:
let let
@ -52,6 +53,7 @@ common =
[ curl openssl sqlite xz bzip2 nlohmann_json [ curl openssl sqlite xz bzip2 nlohmann_json
brotli boost editline brotli boost editline
] ]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock ] ++ lib.optionals is24 [ libarchive gmock ]
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp

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

@ -28574,6 +28574,7 @@ in
storeDir = config.nix.storeDir or "/nix/store"; storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; }; boehmgc = boehmgc.override { enableLargeConfig = true; };
inherit (darwin.apple_sdk.frameworks) Security;
}) })
nix nix
nixStable nixStable