mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 21:30:45 +02:00
linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink
This commit is contained in:
parent
0c18551c93
commit
9ac776ab22
|
@ -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[@]}"
|
||||||
|
|
Loading…
Reference in a new issue