From 11dbafea9e033d7a4ad2a06c8d2175184b08a60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= Date: Thu, 16 Jul 2026 01:00:43 +0300 Subject: [PATCH] various: remove GLEW compatibility workarounds The restored EGL+GLX compatibility patch allows the default GLEW build to support both EGL and GLX again. Remove package specific overrides that forced `enableEGL = false`. --- pkgs/by-name/me/meshlab/package.nix | 7 +------ pkgs/by-name/op/openscad/package.nix | 4 +--- pkgs/by-name/rp/rpcs3/package.nix | 4 +--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index ed277bf0733b..104fbc3a03d2 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -76,12 +76,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 muparser eigen - # MeshLab renders through Qt's xcb platform, which creates a GLX context, - # and calls glewInit() against it. The default EGL-enabled glew is built - # EGL-only (no GLX dispatch table), so glewInit can't read GL_VERSION and - # the app fails to launch with "GLEW initialization failed: Missing GL - # version". See https://github.com/NixOS/nixpkgs/issues/531470 - (glew.override { enableEGL = false; }) + glew gmp levmar qhull diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix index 7cf1da9371b2..ede0cdbd0c8c 100644 --- a/pkgs/by-name/op/openscad/package.nix +++ b/pkgs/by-name/op/openscad/package.nix @@ -127,9 +127,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ eigen boost - # OpenSCAD's GLX offscreen renderer needs GLEW's GLXEW symbols (`__GLXEW_SGIX_pbuffer`, `__GLXEW_SGIX_fbconfig`) - # which are not found in the default EGL-enabled glew and causes the build failure in https://github.com/NixOS/nixpkgs/issues/530529 - (glew.override { enableEGL = false; }) + glew opencsg cgal_5 mpfr diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index bc9d8f9bbde1..b4518e0a27b6 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -117,9 +117,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtmultimedia openal - # RPCS3's X11 swap-interval path uses GLEW's GLXEW symbols, which - # are not provided in the default EGL-enabled GLEW build. - (glew.override { enableEGL = false; }) + glew vulkan-headers vulkan-loader libpng