Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bumblebee: add xf86inputmouse to x11 modules #282646

Closed
wants to merge 1 commit into from
Closed

bumblebee: add xf86inputmouse to x11 modules #282646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bumblebee: add xf86inputmouse to x11 modules 
Without this the X11 server would fail to start with the error:

```(EE) Failed to load module "mouse" (module does not exist, 0)```
  • Loading branch information
@abmantis
abmantis committed Jan 24, 2024
commit 16dfb10f2b56751a70fe4fd190936accb69008df
4 changes: 2 additions & 2 deletions pkgs/tools/X11/bumblebee/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper
, glib, libbsd
, libX11, xorgserver, kmod, xf86videonouveau
, libX11, xorgserver, kmod, xf86videonouveau, xf86inputmouse
, nvidia_x11, virtualgl, libglvnd
, automake111x, autoconf
# The below should only be non-null in a x86_64 system. On a i686
Expand All @@ -42,7 +42,7 @@ let

bbdPath = lib.makeBinPath [ kmod xorgserver ];

xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver xf86inputmouse] ++ lib.optional (!useNvidia) xf86videonouveau));

modprobePatch = fetchpatch {
url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch";
Expand Down