diff options
author | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
commit | 4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3 (patch) | |
tree | 9ba4a2c3ffcee27f93accfb9115bd44bf49a0a2c /pkgs/os-specific/linux/broadcom-sta/default.nix | |
parent | f8fb55b4cc2809dc02c9ca392802716d78d5f4c3 (diff) | |
download | nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.gz nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.bz2 nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.lz nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.xz nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.zst nixlib-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.zip |
Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks for pointing that out, @edolstra) Second, instead of having linuxPackages*.kernel mean something different inside the set and out, add a new attribute linuxPackages*.kernelDev, which for the generic kernel is simply linuxPackages*.kernel but for the manual-config kernel is the `dev' output (which has the build tree, source tree, etc.) The second change required trivial modifications in a bunch of expressions, I verified that all of the linuxPackages* sets defined in all-packages.nix have the same drv paths before and after the change. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/os-specific/linux/broadcom-sta/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 041141cdad25..43ba9dfc2b5e 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, kernelDev }: let version = "5_100_82_112"; bits = if stdenv.system == "i686-linux" then "32" else @@ -6,7 +6,7 @@ let version = "5_100_82_112"; in stdenv.mkDerivation { - name = "broadcom-sta-${version}-${kernel.version}"; + name = "broadcom-sta-${version}-${kernelDev.version}"; src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; @@ -15,13 +15,13 @@ stdenv.mkDerivation { else "1qsarnry10f5m8a73wbr9cg2ifs00sqg6x0ay59l72vl9hb2zlww"; }; - buildInputs = [ kernel ]; + buildInputs = [ kernelDev ]; patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ./linux-3.4.patch ./license.patch ]; - makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"; unpackPhase = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation { installPhase = '' - binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + binDir="$out/lib/modules/${kernelDev.modDirVersion}/kernel/net/wireless/" docDir="$out/share/doc/broadcom-sta/" mkdir -p "$binDir" "$docDir" cp wl.ko "$binDir" |