diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-08 06:20:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 06:20:05 +0000 |
| commit | e21fb16f9a9073f6eba5e250ad13d94eca968df2 (patch) | |
| tree | 1619ab18b58eb9028a31128147377e9073b9cb3c /pkgs/tools/package-management | |
| parent | 01bf14784925e99944d198154007489a823ddfb3 (diff) | |
| parent | 2af2325cf7ff4ca1ee53d5ab4068172a0b6066f2 (diff) | |
| download | nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar.gz nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar.bz2 nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar.lz nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar.xz nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.tar.zst nixpkgs-e21fb16f9a9073f6eba5e250ad13d94eca968df2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac61a64180d..4dfdb7075a5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -21,7 +21,7 @@ common = , storeDir , stateDir , confDir - , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp + , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , pname, version, suffix ? "", src |