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

virtualbox: Fix wrong path when recursing modules.

Browse Source 
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:
aszlig 2012-08-17 14:45:14 +02:00
parent 830e9db5dd
commit 31d8a9a1f4
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/applications/virtualization/virtualbox/default.nix
View File

@ -69,6 +69,7 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
srcroot="$(pwd)"
libexec=$out/libexec/virtualbox libexec=$out/libexec/virtualbox
# Install VirtualBox files # Install VirtualBox files
@ -77,9 +78,8 @@ stdenv.mkDerivation {
cp -av * $libexec cp -av * $libexec
# Install kernel modules # Install kernel modules
curdir="$(pwd)" for makefile in $srcroot/out/linux.*/release/bin/src/*/Makefile \
for makefile in $curdir/out/linux.*/release/bin/src/*/Makefile \ $srcroot/out/linux.*/release/bin/additions/src/*/Makefile
$curdir/out/linux.*/release/bin/additions/src/*/Makefile
do do
mod="$(dirname "$makefile")" mod="$(dirname "$makefile")"
name="$(basename "$mod")" name="$(basename "$mod")"