diff options
Diffstat (limited to 'pkgs/development/libraries/glew/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glew/default.nix | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 4681e4f6abce0..8d68ad0867644 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,7 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, libGLU +, libXmu +, libXi +, libXext , OpenGL -, enableEGL ? false +, enableEGL ? (!stdenv.hostPlatform.isDarwin) , testers +, mesa }: stdenv.mkDerivation (finalAttrs: { @@ -9,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; + url = "mirror://sourceforge/glew/glew-${finalAttrs.version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; @@ -19,13 +28,20 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/nigels-com/glew/pull/342 (fetchpatch { url = "https://github.com/nigels-com/glew/commit/966e53fa153175864e151ec8a8e11f688c3e752d.diff"; - sha256 = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw="; + hash = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw="; + }) + + # don't make EGL support disable GLX, use the same patch as ArchLinux + # https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/blob/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/raw/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch?inline=false"; + hash = "sha256-IG3FPhhaor1kshEH3Kr8yzIHqBhczRwCqH7ZeDwlzGE="; }) ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; cmakeFlags = [ @@ -59,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "glew" ]; platforms = with platforms; if enableEGL then - subtractLists darwin mesaPlatforms + subtractLists darwin mesa.meta.platforms else - mesaPlatforms; + mesa.meta.platforms; }; }) |