ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

Fix problem with linux 3.0 trying to install in /nix/store/...

Browse Source 
Thanks to MarcWeber on IRC for helping with this

svn path=/nixpkgs/trunk/; revision=27921
This commit is contained in:
Shea Levy 2011-07-24 20:24:12 +00:00
parent 1bc8594052
commit 5db8c88547
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -35,6 +35,7 @@
, extraMeta ? {} , extraMeta ? {}
, ubootChooser ? null , ubootChooser ? null
, postInstall ? "" , postInstall ? ""
, setModuleDir ? true
, # After the builder did a 'make all' (kernel + modules) , # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/... # we force building the target asked: bzImage/zImage/uImage/...
@ -74,7 +75,11 @@ stdenv.mkDerivation {
generateConfig = ./generate-config.pl; generateConfig = ./generate-config.pl;
inherit preConfigure src module_init_tools localVersion postBuild postInstall; inherit preConfigure src module_init_tools localVersion postInstall;
postBuild = (if setModuleDir then "" else ''
eval "$(type installPhase | sed -e '1d' -e '/export MODULE_DIR/d')";
'') + postBuild;
patches = map (p: p.patch) kernelPatches; patches = map (p: p.patch) kernelPatches;
@ -140,3 +145,4 @@ stdenv.mkDerivation {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
} // extraMeta; } // extraMeta;
} }

2
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -200,6 +200,8 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;
setModuleDir = false;
features.iwlwifi = true; features.iwlwifi = true;
} }