diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
| commit | 4495d06a7fde26f15ed256f08a24115a013637ea (patch) | |
| tree | 15732b2661ddc8c258110a52f259fdf4c3537c0d /pkgs/os-specific/linux/libcap/progs.nix | |
| parent | 31810da31c98d6e634e2b5cb8eece3e3a67ce0cc (diff) | |
| parent | 643772777369229da75157e9192e3dd7bd2805fb (diff) | |
| download | nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.gz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.bz2 nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.lz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.xz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.zst nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.zip | |
Merge branch 'master' into staging
Conflicts (simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/libcap/progs.nix')
| -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 1902b4acb1a4..ae4446c82e6c 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"; |