summary refs log tree commit diff
path: root/pkgs/tools/X11/bumblebee
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2015-12-05 00:56:16 +0300
committerNikolay Amiantov <ab@fmap.me>2015-12-05 00:56:16 +0300
commitc990a1ed4d264510bd7849d674fbc2dbfb3f6901 (patch)
tree36212d1ad2e59d7d175b6ef73dea52503ce0703d /pkgs/tools/X11/bumblebee
parentcf3202acac9500a192e00b0e2a3b6fdbc97b6153 (diff)
parent28d2ac416eb64426643d3915db81365ecae0d912 (diff)
downloadnixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar.gz
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar.bz2
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar.lz
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar.xz
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.tar.zst
nixlib-c990a1ed4d264510bd7849d674fbc2dbfb3f6901.zip
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.nix7
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