From 38420dfd6fcd932fd5c98b0f73b78fd0fc0f611c Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 17 Jul 2006 21:35:58 +0000 Subject: [PATCH] make sure ov511 2.30 still builds...or builds again... svn path=/nixpkgs/trunk/; revision=5764 --- pkgs/os-specific/linux/ov511/ov511-2.30-default.nix | 2 +- pkgs/os-specific/linux/ov511/ov511-kernel.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix index 60d94f6c63ed..0a4886d1ab1e 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix +++ b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2; md5 = "9eacf9e54f2f54a59ddbf14221a53f2a"; }; - patches = [./ov511-kernel.patch]; + patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch]; inherit kernel; NIX_GLIBC_FLAGS_SET=1; } diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch index e6a3e75f188e..eca39e90fced 100644 --- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch +++ b/pkgs/os-specific/linux/ov511/ov511-kernel.patch @@ -15,8 +15,8 @@ diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh UNAME=`uname -r` -! INSTALL_PATH_2_4=$out/lib/modules/$UNAME/kernel/drivers/usb/ -! INSTALL_PATH_2_6=$out/lib/modules/$UNAME/kernel/drivers/usb/media/ +! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/ +! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/ MAJMIN=`echo $UNAME | cut -d . -f 1-2`