From ff7368e944a904c0389f58f770576a230ab73c08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 14:37:43 +0200 Subject: [PATCH] audit: Move z/OS plugin to a separate output This prevents the NixOS base system from pulling in openldap, cyris-sasl, and libkrb5. --- pkgs/os-specific/linux/audit/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index afe73ef1b5a9..4decc8c7a32a 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31"; }; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "plugins" ]; buildInputs = [ openldap ] ++ stdenv.lib.optional enablePython python; @@ -21,6 +21,16 @@ stdenv.mkDerivation rec { ${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/";