diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-03 11:17:14 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-03 11:17:14 +0100 |
| commit | 003896dfe7665cfb4ceb2fff28c91d1bfa946fbb (patch) | |
| tree | d37d03173313000f1ccc480455668864b53d3da9 /pkgs | |
| parent | f086517f815c0b5921a4bc110e146ccaea98e90b (diff) | |
| parent | 73ec7f243f42185c1a6efb526c0c9d3d3732d6c4 (diff) | |
| download | nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar.gz nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar.bz2 nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar.lz nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar.xz nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.tar.zst nixpkgs-003896dfe7665cfb4ceb2fff28c91d1bfa946fbb.zip | |
Merge pull request #6109 from j-keck/libcap_progs
libcap_progs: fix bash path
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/progs.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index 1902b4acb1a..ae4446c82e6 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { buildInputs = [ libcap ]; + 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 + ''; + preConfigure = "cd progs"; installFlags = "RAISE_SETFCAP=no"; |