From 54eef655333659bef5f4e1057dcddad8963c4af8 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 3 Oct 2015 19:12:06 +0200 Subject: libcap*: fix with multiple outputs I don't think we need the license file in each of these, so I only left it with the library (it isn't big). --- pkgs/os-specific/linux/libcap/default.nix | 1 + pkgs/os-specific/linux/libcap/man.nix | 2 -- pkgs/os-specific/linux/libcap/pam.nix | 2 -- pkgs/os-specific/linux/libcap/progs.nix | 5 ++++- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/os-specific/linux/libcap') diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 84e363b6824..c8484babcdf 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { makeFlags = "lib=lib prefix=$(out)"; postInstall = '' + rm "$out"/lib/*.a mkdir -p "$dev/share/doc/${name}" cp ../License "$dev/share/doc/${name}/License" ''; diff --git a/pkgs/os-specific/linux/libcap/man.nix b/pkgs/os-specific/linux/libcap/man.nix index 9aac3c4e1f5..eeb780f095b 100644 --- a/pkgs/os-specific/linux/libcap/man.nix +++ b/pkgs/os-specific/linux/libcap/man.nix @@ -10,6 +10,4 @@ stdenv.mkDerivation rec { makeFlags = "MANDIR=$(out)/share/man"; preConfigure = "cd doc"; - - postInstall = libcap.postinst name; } diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix index b78f32dccbb..3dd7cd947af 100644 --- a/pkgs/os-specific/linux/libcap/pam.nix +++ b/pkgs/os-specific/linux/libcap/pam.nix @@ -12,6 +12,4 @@ stdenv.mkDerivation rec { preConfigure = "cd pam_cap"; makeFlags = "${libcap.makeFlags} PAM_CAP=yes"; - - postInstall = libcap.postinst name; } diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index ae4446c82e6..e3871f15f88 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { installFlags = "RAISE_SETFCAP=no"; - postInstall = libcap.postinst name; + postInstall = '' + mkdir -p "$out/share/doc/${name}" + cp ../License "$out/share/doc/${name}/" + ''; } -- cgit 1.4.1