Author: shlevy
Date: Sun Jul 24 20:24:12 2011
New Revision: 27921
URL: https://svn.nixos.org/websvn/nix/?rev=27921&sc=1
Log:
Fix problem with linux 3.0 trying to install in /nix/store/...
Thanks to MarcWeber on IRC for helping with this
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sun Jul 24
20:05:08 2011 (r27920)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sun Jul 24
20:24:12 2011 (r27921)
@@ -35,6 +35,7 @@
, extraMeta ? {}
, ubootChooser ? null
, postInstall ? ""
+, setModuleDir ? true
, # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/...
@@ -74,7 +75,11 @@
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;
@@ -140,3 +145,4 @@
platforms = lib.platforms.linux;
} // extraMeta;
}
+
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Sun Jul 24
20:05:08 2011 (r27920)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Sun Jul 24
20:24:12 2011 (r27921)
@@ -200,6 +200,8 @@
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
+ setModuleDir = false;
+
features.iwlwifi = true;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
