diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-18 12:03:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-18 12:03:19 +0100 |
commit | b89c3afb5f6ab8544b19112969f8b3f80a7bbedc (patch) | |
tree | 600986973c82cd6e2b4dc4e16e6b6b4028023ea3 | |
parent | c88fa59559317dba2ca31c0f98a1adfe42f35016 (diff) | |
parent | 49fc06ed0aaf73cd6c72ef0d59dd0105a29dc488 (diff) | |
download | nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar.gz nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar.bz2 nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar.lz nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar.xz nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.tar.zst nixlib-b89c3afb5f6ab8544b19112969f8b3f80a7bbedc.zip |
Merge pull request #29523 from aneeshusa/audit-remove-openldap-dependency
audit: Remove openldap dependency
-rw-r--r-- | pkgs/os-specific/linux/audit/default.nix | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index e433deff90c6..725c788dd1ac 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, openldap -, enablePython ? false, python ? null +{ + stdenv, fetchurl, + enablePython ? false, python ? null, }: assert enablePython -> python != null; @@ -12,25 +13,19 @@ stdenv.mkDerivation rec { sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq"; }; - outputs = [ "bin" "dev" "out" "man" "plugins" ]; + outputs = [ "bin" "dev" "out" "man" ]; - buildInputs = [ openldap ] - ++ stdenv.lib.optional enablePython python; + buildInputs = stdenv.lib.optional enablePython python; - configureFlags = '' - ${if enablePython then "--with-python" else "--without-python"} - ''; + configureFlags = [ + # z/OS plugin is not useful on Linux, + # and pulls in an extra openldap dependency otherwise + "--disable-zos-remote" + (if enablePython then "--with-python" else "--without-python") + ]; enableParallelBuilding = true; - postInstall = - '' - # Move the z/OS plugin to a separate output to prevent an - # openldap runtime dependency in audit.bin. - mkdir -p $plugins/bin - mv $bin/sbin/audispd-zos-remote $plugins/bin/ - ''; - meta = { description = "Audit Library"; homepage = http://people.redhat.com/sgrubb/audit/; |