diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-12-17 16:53:35 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-12-17 16:53:35 -0500 |
| commit | 5ba4eb2d2e6f5d6536d9c0f61fbf1d6db4c8f4db (patch) | |
| tree | d4663fc40f9e203ea29206ad72ed0a4e8ba674af | |
| parent | 823bc77463eea0938fb0f0b35d4efb92f5aea458 (diff) | |
glew{,110}: don't depend on mesa on darwin
| -rw-r--r-- | pkgs/development/libraries/glew/1.10.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/glew/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 02737143e0db5..139b93c039ec1 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi -, AGL ? null +, AGL, OpenGL }: with stdenv.lib; @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ xlibsWrapper libXmu libXi ] - ++ optionals stdenv.isDarwin [ AGL ]; - propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = if stdenv.isDarwin then [ AGL ] else [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 80a7759c5749b..3b067e6d0f309 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +, OpenGL }: with stdenv.lib; @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - buildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0ae1a7581e10..a33890bc1903b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13060,9 +13060,11 @@ in gle = callPackage ../development/libraries/gle { }; - glew = callPackage ../development/libraries/glew { }; + glew = callPackage ../development/libraries/glew { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; glew110 = callPackage ../development/libraries/glew/1.10.nix { - inherit (darwin.apple_sdk.frameworks) AGL; + inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; glfw = glfw3; |