diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-18 17:00:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 17:00:05 +0000 |
| commit | bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba (patch) | |
| tree | c110499a36da9d9af4ea62836be662494641c2f5 /pkgs/os-specific/linux/libcap/default.nix | |
| parent | 4b0e1b22cfa3493e55083b10bd0e2964e1f50519 (diff) | |
| parent | 116fb2a6107edc9aa2c600f31faa9219248ad05e (diff) | |
| download | nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar.gz nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar.bz2 nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar.lz nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar.xz nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.tar.zst nixpkgs-bcc7d46e9c03a5e122d3bf80530ad49359bfd9ba.zip | |
Merge pull request #109102 from Izorkin/libcap-update
Diffstat (limited to 'pkgs/os-specific/linux/libcap/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 4c4238a7e0e..246f02805f0 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.44"; + version = "2.46"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; + sha256 = "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf"; }; patches = lib.optional isStatic ./no-shared-lib.patch; @@ -34,11 +34,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # use relative bash path - substituteInPlace progs/capsh.c --replace "/bin/bash" "bash" - - # ensure capsh can find bash in $PATH - substituteInPlace progs/capsh.c --replace execve execvpe + # use full path to bash + substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}" # set prefixes substituteInPlace Make.Rules \ |