diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-08-17 14:45:14 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-08-19 09:02:15 +0200 |
| commit | 31d8a9a1f4043205978e5b2587b53aba841850d5 (patch) | |
| tree | 3cff9dc81b7f6a058502034c03848dafc1d1e0a4 /pkgs/applications/virtualization | |
| parent | 830e9db5ddfec4c2f8708318d566874eae83c7a3 (diff) | |
| download | nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar.gz nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar.bz2 nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar.lz nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar.xz nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.tar.zst nixpkgs-31d8a9a1f4043205978e5b2587b53aba841850d5.zip | |
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.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6fc9dcf4bc2..f0b9e7d078e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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")" |