diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.1.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index d2c2b5f13077..9749b1568e46 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { (! 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 @@ stdenv.mkDerivation { 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" diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 18514af45016..a19afb2a0a9e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -193,6 +193,8 @@ import ./generic.nix ( rec { version = "3.1-rc1"; + + modDirVersion = "3.1.0-rc1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2"; |