From 65218ec5709af8bc800975b773e5d8fce4881cc7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 13 Jan 2008 10:33:27 +0000 Subject: [PATCH] Maybe I recommit aggregator.nix, but I found last time it could be wrong svn path=/nixpkgs/trunk/; revision=10131 --- pkgs/os-specific/linux/module-init-tools/aggregator.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/module-init-tools/aggregator.nix index 37c072c0d3d..951906691b1 100644 --- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix +++ b/pkgs/os-specific/linux/module-init-tools/aggregator.nix @@ -11,8 +11,8 @@ doCollect = FullDepEntry ('' ensureDir $out/lib/modules cd $out/ for i in $moduleSources; do - cp -rs $i/lib/modules lib/ - chmod -R u+w lib/ + cp -rfs $i/* . + chmod -R u+w . done cd lib/modules/ rm */modules.* @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = " A directory to hold all the modules, including those - built separately from kernel. Earlier directories in + built separately from kernel. Later mentioned directories in moduleSources have higher priority. "; };