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

Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"

Browse Source 
This reverts commit 9deb7f8aae431ed7725cfaa13edf8645d19d91f2.
This commit is contained in:
Michael Raskin 2014-09-02 20:17:55 +04:00
parent d812281674
commit af4c369d0a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -97,9 +97,9 @@ filterExisting() {
wrapProgram() { wrapProgram() {
local prog="$1" local prog="$1"
local progBasename=$(basename $prog) local progBasename=$(basename $prog)
local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin" local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
mkdir -p $hiddenDir local hidden=$hiddenDir/$progBasename
local hidden="$(cd "$hiddenDir"; pwd)/$progBasename" mkdir $hiddenDir
mv $prog $hidden mv $prog $hidden
makeWrapper $hidden $prog "$@" makeWrapper $hidden $prog "$@"
} }