From 8f6a5202d38e2f3c9f6a2d067acccfa7a86a4c27 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Jul 2025 21:49:33 +0200 Subject: [PATCH] bumblebee: unpin autotools --- pkgs/by-name/bu/bumblebee/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix index cfffcec882f6..142ba0523280 100644 --- a/pkgs/by-name/bu/bumblebee/package.nix +++ b/pkgs/by-name/bu/bumblebee/package.nix @@ -35,8 +35,7 @@ pkgsi686Linux, virtualgl, libglvnd, - automake111x, - autoconf, + autoreconfHook, # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? @@ -124,10 +123,6 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - # Don't use a special group, just reuse wheel. - substituteInPlace configure \ - --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' - # Apply configuration options substituteInPlace conf/xorg.conf.nvidia \ --subst-var nvidiaDeviceOptions @@ -148,8 +143,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config help2man - automake111x - autoconf + autoreconfHook ]; # The order of LDPATH is very specific: First X11 then the host @@ -162,6 +156,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" + # Don't use a special group, just reuse wheel. + "CONF_GID=wheel" # see #10282 #"CONF_PRIMUS_LD_PATH=${primusLibs}" ]