Merge pull request #11262 from spwhitt/bumblebee_have

bumblebee: use _have not have in bash completion
This commit is contained in:
Nikolay Amiantov 2015-12-05 00:56:16 +03:00
commit c990a1ed4d

View File

@ -67,6 +67,13 @@ in stdenv.mkDerivation rec {
nouveauDeviceOptions = extraNouveauDeviceOptions; nouveauDeviceOptions = extraNouveauDeviceOptions;
# the have() function is deprecated and not available to bash completions the
# way they are currently loaded in NixOS, so use _have. See #10936
patchPhase = ''
substituteInPlace scripts/bash_completion/bumblebee \
--replace "have optirun" "_have optirun"
'';
preConfigure = '' preConfigure = ''
# Substitute the path to the actual modinfo program in module.c. # Substitute the path to the actual modinfo program in module.c.
# Note: module.c also calls rmmod and modprobe, but those just have to # Note: module.c also calls rmmod and modprobe, but those just have to