diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 19:12:06 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 09:49:19 +0200 |
commit | 54eef655333659bef5f4e1057dcddad8963c4af8 (patch) | |
tree | 64fbd85904ce27da84c90fc13a1f58405226a6f0 | |
parent | c83b59130fac7edfd5c856409835bee10044725a (diff) | |
download | nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar.gz nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar.bz2 nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar.lz nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar.xz nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.tar.zst nixlib-54eef655333659bef5f4e1057dcddad8963c4af8.zip |
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).
-rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/man.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/pam.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/progs.nix | 5 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 84e363b68242..c8484babcdf8 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 9aac3c4e1f5a..eeb780f095bd 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 b78f32dccbb4..3dd7cd947af2 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 ae4446c82e6c..e3871f15f885 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}/" + ''; } |