diff options
author | Nikolay Amiantov <ab@fmap.me> | 2015-12-05 00:56:16 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2015-12-05 00:56:16 +0300 |
commit | c990a1ed4d264510bd7849d674fbc2dbfb3f6901 (patch) | |
tree | 36212d1ad2e59d7d175b6ef73dea52503ce0703d /pkgs/tools/X11/bumblebee | |
parent | cf3202acac9500a192e00b0e2a3b6fdbc97b6153 (diff) | |
parent | 28d2ac416eb64426643d3915db81365ecae0d912 (diff) |
Merge pull request #11262 from spwhitt/bumblebee_have
bumblebee: use _have not have in bash completion
Diffstat (limited to 'pkgs/tools/X11/bumblebee')
-rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index a4d97f52361c..d1f0ce93ab48 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -67,6 +67,13 @@ in stdenv.mkDerivation rec { 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 = '' # Substitute the path to the actual modinfo program in module.c. # Note: module.c also calls rmmod and modprobe, but those just have to |