diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-19 10:25:56 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-19 10:26:44 -0400 |
| commit | 28a76a96bee8438de15f4c8abfb115d51e7ba0ba (patch) | |
| tree | 8d06dffbc1eac7e04bb62b9bfb1c05d01c7f5a2b /pkgs/os-specific/linux/libcap | |
| parent | b5ff5d0371a95f302f383f6f08d3ff59669b3718 (diff) | |
| download | nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar.gz nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar.bz2 nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar.lz nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar.xz nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.tar.zst nixpkgs-28a76a96bee8438de15f4c8abfb115d51e7ba0ba.zip | |
libcap: Update to 2.22
Systemd requires the recent CAP_SYSLOG capability.
Diffstat (limited to 'pkgs/os-specific/linux/libcap')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libcap/pam.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libcap/progs.nix | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index c279393d7a4..667fe63bba7 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, attr, perl}: +{ stdenv, fetchurl, attr, perl }: assert stdenv.isLinux; stdenv.mkDerivation rec { name = "libcap-${version}"; - version = "2.19"; + version = "2.22"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/${name}.tar.gz"; - sha256 = "0fdsz9j741npvh222f8p1y6l516z9liibiwdpdr3a4zg53m0pw45"; + url = "mirror://gentoo/distfiles/${name}.tar.bz2"; + sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - buildNativeInputs = [perl]; - propagatedBuildInputs = [attr]; + buildNativeInputs = [ perl ]; + propagatedBuildInputs = [ attr ]; preConfigure = "cd libcap"; @@ -26,4 +26,9 @@ stdenv.mkDerivation rec { }; postInstall = passthru.postinst name; + + meta = { + description = "Library for working with POSIX capabilities"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix index 4cefa825c8a..b78f32dccbb 100644 --- a/pkgs/os-specific/linux/libcap/pam.nix +++ b/pkgs/os-specific/linux/libcap/pam.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "cap_pam.so-${libcap.version}"; + name = "libcap-pam-${libcap.version}"; inherit (libcap) src; diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index 1b38848e77e..1902b4acb1a 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd progs"; + installFlags = "RAISE_SETFCAP=no"; + postInstall = libcap.postinst name; } |