summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2015-05-06 09:35:38 +0200
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2015-05-06 09:50:51 +0200
commit0c5be7164c0dacbef334bcc84d927c1890363584 (patch)
tree85631aabba1269654dcb22064807efddb5ab7d7c /pkgs/os-specific
parent0f2de4c64e451a82ff5b7cbef3fead5c1cb01120 (diff)
downloadnixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar.gz
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar.bz2
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar.lz
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar.xz
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.tar.zst
nixpkgs-0c5be7164c0dacbef334bcc84d927c1890363584.zip
sheevaplug: fix kernel build.
I added platform.kernelMakeFlags. This allows setting the required
parameter to make the required kernel uImage for the sheevaplug,
since it became a platform with devicetree (3.10).

I have tried it with linux 3.18 and it built fine.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 620df6dd6cf..c57082c9330 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -49,7 +49,8 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ];
+  ] ++ stdenv.lib.optionals (stdenv.platform ? kernelMakeFlags)
+    stdenv.platform.kernelMakeFlags;
 
   drvAttrs = config_: platform: kernelPatches: configfile:
     let