diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
| commit | 8c4aeb17808e6d33515bb9178eaca942c588b31d (patch) | |
| tree | 202a33b2dd86ab28d168778b313f184a9ecc0bda /pkgs/tools/security | |
| parent | 003ab1d9fdaf2818a1e5a6e53825d31ac2e23621 (diff) | |
| parent | 838c75398cc46cf2acbe144b1f3866d736abe430 (diff) | |
| download | nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.gz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.bz2 nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.lz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.xz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.zst nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.zip | |
Merge staging into master
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/modsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/pinentry/qt5.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/tcpcrypt/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 881362e4acb4..0cb34b2e73c9 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" - "--with-xml=${libxml2}" + "--with-xml=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--with-libncurses-prefix=${ncurses.dev}" "--with-libcurl=${curl.dev}" diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 0b6900fb214d..a5e03eb3fe16 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pcre=${pcre.dev}" "--with-apr=${apr.dev}" "--with-apu=${aprutil.dev}/bin/apu-1-config" - "--with-libxml=${libxml2}" + "--with-libxml=${libxml2.dev}" ]; outputs = ["out" "nginx"]; diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix index d0811cdd11af..18648633a097 100644 --- a/pkgs/tools/security/pinentry/qt5.nix +++ b/pkgs/tools/security/pinentry/qt5.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # configure cannot find moc on its own preConfigure = '' - export QTDIR="${qtbase}" - export MOC="${qtbase}/bin/moc" + export QTDIR="${qtbase.dev}" + export MOC="${qtbase.dev}/bin/moc" ''; configureFlags = [ diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 48eefcb0f187..222b861f937c 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postUnpack = ''mkdir -vp $sourceRoot/m4''; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl ] ++ optionals stdenv.isLinux [ libcap libpcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; |