virtualbox: Fix wrong path when recursing modules.
The for loop didn't find $curdir, because it was set _after_ the directory has been changed. The variable is now called $srcroot and is set before the installPhase is changing directories.
This commit is contained in:
parent
830e9db5dd
commit
31d8a9a1f4
@ -69,6 +69,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
srcroot="$(pwd)"
|
||||
libexec=$out/libexec/virtualbox
|
||||
|
||||
# Install VirtualBox files
|
||||
@ -77,9 +78,8 @@ stdenv.mkDerivation {
|
||||
cp -av * $libexec
|
||||
|
||||
# Install kernel modules
|
||||
curdir="$(pwd)"
|
||||
for makefile in $curdir/out/linux.*/release/bin/src/*/Makefile \
|
||||
$curdir/out/linux.*/release/bin/additions/src/*/Makefile
|
||||
for makefile in $srcroot/out/linux.*/release/bin/src/*/Makefile \
|
||||
$srcroot/out/linux.*/release/bin/additions/src/*/Makefile
|
||||
do
|
||||
mod="$(dirname "$makefile")"
|
||||
name="$(basename "$mod")"
|
||||
|
Loading…
Reference in New Issue
Block a user