JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109102 from Izorkin/libcap-update

Browse Source
This commit is contained in:
Jörg Thalheim 2021-01-18 17:00:05 +00:00 committed by GitHub
commit bcc7d46e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/libcap-ng/default.nix
View File

@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
pname = "libcap-ng";
# When updating make sure to test that the version with
# all of the python bindings still works
version = "0.8";
version = "0.8.2";
src = fetchurl {
url = "${meta.homepage}/${pname}-${version}.tar.gz";
sha256 = "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi";
sha256 = "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j";
};
nativeBuildInputs = [ swig ];

11
pkgs/os-specific/linux/libcap/default.nix
View File

@ -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 \