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

linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink

Browse Source
This commit is contained in:
Shea Levy 2012-08-11 21:07:37 -04:00
parent 0c18551c93
commit 9ac776ab22
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -113,8 +113,7 @@ let self = stdenv.mkDerivation {
}; };
unpackPhase = '' unpackPhase = ''
ln -sv ${self.source} src export sourceRoot="${self.source}"
export sourceRoot="$(pwd)/src"
mkdir build mkdir build
export buildRoot="$(pwd)/build" export buildRoot="$(pwd)/build"
cd $sourceRoot cd $sourceRoot
@ -146,12 +145,9 @@ let self = stdenv.mkDerivation {
'' + (if isModular then '' '' + (if isModular then ''
make modules_install $makeFlags "''${makeFlagsArray[@]}" \ make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"
rm -f $out/lib/modules/${modDirVersion}/{build,source} rm -f $out/lib/modules/${modDirVersion}/build
cd .. cd $buildRoot/..
mv $sourceRoot $out/lib/modules/${modDirVersion}/source
mv $buildRoot $out/lib/modules/${modDirVersion}/build mv $buildRoot $out/lib/modules/${modDirVersion}/build
unlink $out/lib/modules/${modDirVersion}/build/source
ln -sv ${self.source} $out/lib/modules/${modDirVersion}/build/source
'' else optionalString installsFirmware '' '' else optionalString installsFirmware ''
make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}"