From 6d072802633b83b1aa263d6330a49f7db7e78d04 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2008 08:36:10 +0000
Subject: [PATCH] * Use fxload.

svn path=/nixpkgs/trunk/; revision=10488
---
 pkgs/os-specific/linux/wis-go7007/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix
index 8637cc5d68e..3e35c83488a 100644
--- a/pkgs/os-specific/linux/wis-go7007/default.nix
+++ b/pkgs/os-specific/linux/wis-go7007/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, kernel, ncurses}:
+{stdenv, fetchurl, kernel, ncurses, fxload}:
 
 stdenv.mkDerivation {
-  name = "wis-go7007-linux-0.9.8";
+  name = "wis-go7007-0.9.8";
 
   src = fetchurl {
     url = http://gentoo.osuosl.org/distfiles/wis-go7007-linux-0.9.8.tar.bz2;
@@ -35,17 +35,23 @@ stdenv.mkDerivation {
     #includeDir=$out/lib/modules/$kernelVersion/source/include/linux
     includeDir=$TMPDIR/scratch
     substituteInPlace Makefile \
-        --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir
+        --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir \
+        --replace '$(DESTDIR)$(FIRMWARE_DIR)' '$(FIRMWARE_DIR)'
     ensureDir $includeDir
     ensureDir $out/etc/hotplug/usb
     ensureDir $out/etc/udev/rules.d
  
     makeFlagsArray=(KERNELSRC=$kernelSource \
-        FIRMWARE_DIR=/firmware FXLOAD=false \
+        FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \
         DESTDIR=$out SKIP_DEPMOD=1 \
         USE_UDEV=y)
   ''; # */
 
+  postInstall = ''
+    ensureDir $out/bin
+    cp apps/gorecord apps/modet $out/bin/
+  '';
+
   meta = {
     description = "Kernel module for the Micronas GO7007, used in a number of USB TV devices";
     homepage = http://oss.wischip.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b13c01e060b..71baf947d3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3950,7 +3950,7 @@ rec {
   };
 
   wis_go7007 = import ../os-specific/linux/wis-go7007 {
-    inherit fetchurl stdenv kernel ncurses;
+    inherit fetchurl stdenv kernel ncurses fxload;
   };
 
   wpa_supplicant = import ../os-specific/linux/wpa_supplicant {