diff options
| author | Shea Levy <shea@shealevy.com> | 2012-08-01 11:56:12 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-08-01 11:56:12 -0400 |
| commit | ad49d928995ec9337c02be4dd1f6c7e34e520c97 (patch) | |
| tree | 09ad2a7b915885e4927855bbbda90b9bf52fc712 /pkgs/os-specific/linux/kernel | |
| parent | 3f4fd55c63de3eb7250606c9a2b0d84eb2bc89f2 (diff) | |
| download | nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar.gz nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar.bz2 nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar.lz nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar.xz nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.tar.zst nixpkgs-ad49d928995ec9337c02be4dd1f6c7e34e520c97.zip | |
linux/manual-config: When installing firmware, create the firmware directory prior to make *_install.
It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index a4929102cb7..3f2d5d0a39c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -111,7 +111,9 @@ stdenv.mkDerivation { ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; - postInstall = if isModular then '' + postInstall = stdenv.lib.optionalString installsFirmware '' + mkdir -p $out/lib/firmware + '' + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" rm -f $out/lib/modules/${modDirVersion}/{build,source} @@ -123,7 +125,7 @@ stdenv.mkDerivation { '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" - ''; + ''); postFixup = optionalString isModular '' if [ -z "$dontStrip" ]; then |