diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-05 13:37:38 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-05 15:02:04 +0100 |
| commit | d84a33d85b621f4621f4e4da1c74b8ad896a349e (patch) | |
| tree | e773c07b718c4ccfe8474735a5ecd4930512ef17 /pkgs/tools/system | |
| parent | d9707792b5e1af8999ddcb790b8b1b06305dd186 (diff) | |
| parent | 17f4d415a2270441dd19f7abcc2fe7b5a1c6900b (diff) | |
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/fakeroot/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 8796de4e9e070..1a16a8a34c7fa 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, getopt, libcap }: +{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: stdenv.mkDerivation rec { version = "1.23"; @@ -29,14 +29,12 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ getopt ] + buildInputs = [ getopt gnused ] ++ stdenv.lib.optional (!stdenv.isDarwin) libcap ; postUnpack = '' - for prog in getopt; do - sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in - done + sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in ''; meta = { |