Author: shlevy
Date: Mon Aug 8 20:49:59 2011
New Revision: 28406
URL: https://svn.nixos.org/websvn/nix/?rev=28406&sc=1
Log:
linux-3.1.nix: Set modDirVersion
broadcom-sta: use kernel.modDirVersion in place of kernel.version
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Mon Aug
8 20:49:49 2011 (r28405)
+++ nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Mon Aug
8 20:49:59 2011 (r28406)
@@ -20,7 +20,7 @@
(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
[ ./mutex-sema.patch ];
- makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";
+ makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
unpackPhase =
''
@@ -31,7 +31,7 @@
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/"
ensureDir "$binDir" "$docDir"
cp wl.ko "$binDir"
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Mon Aug 8
20:49:49 2011 (r28405)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Mon Aug 8
20:49:59 2011 (r28406)
@@ -193,6 +193,8 @@
rec {
version = "3.1-rc1";
+
+ modDirVersion = "3.1.0-rc1";
src = fetchurl {
url =
"mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
