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/bbswitch | |
parent | f8fb55b4cc2809dc02c9ca392802716d78d5f4c3 (diff) | |
download | nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.gz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.bz2 nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.lz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.xz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.zst nixpkgs-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/bbswitch')
-rw-r--r-- | pkgs/os-specific/linux/bbswitch/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index bdfa6f5da6f..692ec0df5bd 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, kernelDev }: let baseName = "bbswitch"; version = "0.6"; - name = "${baseName}-${version}-${kernel.version}"; + name = "${baseName}-${version}-${kernelDev.version}"; in @@ -17,13 +17,13 @@ stdenv.mkDerivation { preBuild = '' substituteInPlace Makefile \ - --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \ - --replace "/lib/modules" "${kernel}/lib/modules" + --replace "\$(shell uname -r)" "${kernelDev.modDirVersion}" \ + --replace "/lib/modules" "${kernelDev}/lib/modules" ''; installPhase = '' - ensureDir $out/lib/modules/${kernel.modDirVersion}/misc - cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc + ensureDir $out/lib/modules/${kernelDev.modDirVersion}/misc + cp bbswitch.ko $out/lib/modules/${kernelDev.modDirVersion}/misc ensureDir $out/bin tee $out/bin/discrete_vga_poweroff << EOF |