From 5fc64e5f9cd6def6a22cb518b5549280af084ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 18 Feb 2010 10:25:33 +0000
Subject: [PATCH] Again, trying to fix the kernel build. It seems that there is
 no make target named 'vmlinuz' that makes the file 'vmlinuz'. So we need
 different variables for the make target and the kernel file. Unless we some
 day stop using the file 'vmlinuz' in pc, and use bzImage.

svn path=/nixpkgs/trunk/; revision=20092
---
 pkgs/development/libraries/opencascade/default.nix | 5 ++++-
 pkgs/os-specific/linux/kernel/builder.sh           | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 2f178edccd5e..56c97f7686e5 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ mesa qt4 tcl tk];
 
-  preConfigure = "cd ros";
+  preConfigure = ''
+    export LDFLAGS=-L$out/lib
+    cd ros
+  '';
 
   postInstall = ''
     mv $out/inc $out/include
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 75283e835de5..48e173e1baa2 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -40,7 +40,9 @@ configurePhase() {
 postBuild() {
     # After the builder did a 'make all' (kernel + modules)
     # we force building the target asked: bzImage/zImage/uImage/...
-    make $makeFlags $kernelTarget
+    if [ "$kernelTarget" != "vmlinuz" ]; then
+        make $makeFlags $kernelTarget
+    fi
 }
 
 installPhase() {