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/tp_smapi | |
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/tp_smapi')
-rw-r--r-- | pkgs/os-specific/linux/tp_smapi/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 224b808721bf..140021605eaf 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl, kernel}: +{stdenv, fetchurl, kernelDev}: stdenv.mkDerivation { - name = "tp_smapi-0.41-${kernel.version}"; + name = "tp_smapi-0.41-${kernelDev.version}"; src = fetchurl { url = "https://github.com/downloads/evgeni/tp_smapi/tp_smapi-0.41.tar.gz"; sha256 = "6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666"; }; - buildInputs = [ kernel ]; + buildInputs = [ kernelDev ]; makeFlags = [ - "KBASE=${kernel}/lib/modules/${kernel.modDirVersion}" + "KBASE=${kernelDev}/lib/modules/${kernelDev.modDirVersion}" "SHELL=/bin/sh" ]; installPhase = '' - install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko" - install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko" + install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernelDev.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko" + install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernelDev.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko" ''; dontStrip = true; |