From 49fc06ed0aaf73cd6c72ef0d59dd0105a29dc488 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 20 Aug 2017 17:40:43 -0700
Subject: [PATCH] audit: Remove openldap dependency

The openldap dependency is only used for the audisp z/OS plugin.
This is not useful on Linux, so always disable this.
---
 pkgs/os-specific/linux/audit/default.nix | 27 ++++++++++--------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index e433deff90c..725c788dd1a 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/;