diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-09 16:13:38 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-09 16:21:22 -0500 |
| commit | c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e (patch) | |
| tree | b87722066b6e7e83fa4a650ef84932b997b4ce58 /pkgs/tools | |
| parent | 8a98cf97e92cecba4feda766f4b7ac36cd82f8ea (diff) | |
| download | nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.gz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.bz2 nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.lz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.xz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.zst nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.zip | |
treewide: remove lib.meta.enableIfAvailable
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1d15bd11b7fa..8f503d12935e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox-sandbox-shell +, busybox-sandbox-shell , hostPlatform, buildPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" +, withLibseccomp ? libseccomp.meta.available, libseccomp }: let @@ -30,7 +31,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals is20 [ brotli ] # Since 1.12 - ++ lib.meta.enableIfAvailable libseccomp + ++ lib.optional withLibseccomp libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; |