Author: mkwik
Date: Sun Mar 18 23:13:41 2012
New Revision: 33244
URL: https://nixos.org/websvn/nix/?rev=33244&sc=1
Log:
bbswitch: use the modDirVersion instead of version
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Sun Mar 18
22:51:17 2012 (r33243)
+++ nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Sun Mar 18
23:13:41 2012 (r33244)
@@ -15,15 +15,14 @@
};
preBuild = ''
- kernelVersion=$(cd ${kernel}/lib/modules && ls)
substituteInPlace Makefile \
- --replace "\$(shell uname -r)" "${kernel.version}" \
+ --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \
--replace "/lib/modules" "${kernel}/lib/modules"
'';
installPhase = ''
- ensureDir $out/lib/modules/${kernel.version}/misc
- cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
+ ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
+ cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc
ensureDir $out/bin
tee $out/bin/discrete_vga_poweroff << EOF
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
