public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-3.1.nix: Set modDirVersion

Browse Source 
broadcom-sta: use kernel.modDirVersion in place of kernel.version

svn path=/nixpkgs/trunk/; revision=28406
This commit is contained in:
Shea Levy 2011-08-08 20:49:59 +00:00
parent ffdc37215a
commit 532511e7f5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) (! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
[ ./mutex-sema.patch ]; [ ./mutex-sema.patch ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build"; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
unpackPhase = unpackPhase =
'' ''
@ -31,7 +31,7 @@ stdenv.mkDerivation {
installPhase = installPhase =
'' ''
binDir="$out/lib/modules/${kernel.version}/kernel/net/wireless/" binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
docDir="$out/share/doc/broadcom-sta/" docDir="$out/share/doc/broadcom-sta/"
ensureDir "$binDir" "$docDir" ensureDir "$binDir" "$docDir"
cp wl.ko "$binDir" cp wl.ko "$binDir"

2
pkgs/os-specific/linux/kernel/linux-3.1.nix
View File

@ -194,6 +194,8 @@ import ./generic.nix (
rec { rec {
version = "3.1-rc1"; version = "3.1-rc1";
modDirVersion = "3.1.0-rc1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2"; url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2";
sha256 = "04m3zh6pn54hi39awvsrh5bgmhz2pkkw0i07grgjv5spai90wls1"; sha256 = "04m3zh6pn54hi39awvsrh5bgmhz2pkkw0i07grgjv5spai90wls1";