diff options
| author | Shea Levy <shea@shealevy.com> | 2012-08-11 21:07:37 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-08-11 21:07:37 -0400 |
| commit | 9ac776ab221317fdac18cbcb14c61e46cd2fa1a2 (patch) | |
| tree | a024fc1c89f4ca67005a3ab2d82044794c315028 /pkgs | |
| parent | 0c18551c93d1d9f8555fadc8edbc460d1493a889 (diff) | |
| download | nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar.gz nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar.bz2 nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar.lz nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar.xz nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.tar.zst nixlib-9ac776ab221317fdac18cbcb14c61e46cd2fa1a2.zip | |
linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index aa00bd2786a5..78b468176f28 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -113,8 +113,7 @@ let self = stdenv.mkDerivation { }; unpackPhase = '' - ln -sv ${self.source} src - export sourceRoot="$(pwd)/src" + export sourceRoot="${self.source}" mkdir build export buildRoot="$(pwd)/build" cd $sourceRoot @@ -146,12 +145,9 @@ let self = stdenv.mkDerivation { '' + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" - rm -f $out/lib/modules/${modDirVersion}/{build,source} - cd .. - mv $sourceRoot $out/lib/modules/${modDirVersion}/source + rm -f $out/lib/modules/${modDirVersion}/build + cd $buildRoot/.. 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 '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" |