diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 20:17:55 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 20:17:55 +0400 |
| commit | af4c369d0a21e77afb1bdb0993e67e027d29235a (patch) | |
| tree | 735557a8c6cd34ab1e57a75ea7c9f51400d81210 /pkgs/build-support/setup-hooks/make-wrapper.sh | |
| parent | d812281674d6852a61e9aebc24787ce3213a2c95 (diff) | |
| download | nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar.gz nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar.bz2 nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar.lz nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar.xz nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.tar.zst nixlib-af4c369d0a21e77afb1bdb0993e67e027d29235a.zip | |
Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"
This reverts commit 9deb7f8aae431ed7725cfaa13edf8645d19d91f2.
Diffstat (limited to 'pkgs/build-support/setup-hooks/make-wrapper.sh')
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index dd43068be279..95d1a5192137 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -97,9 +97,9 @@ filterExisting() { wrapProgram() { local prog="$1" local progBasename=$(basename $prog) - local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin" - mkdir -p $hiddenDir - local hidden="$(cd "$hiddenDir"; pwd)/$progBasename" + local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin + local hidden=$hiddenDir/$progBasename + mkdir $hiddenDir mv $prog $hidden makeWrapper $hidden $prog "$@" } |