From 0edb35ad78a3c656dce09573f9c0eff11fe0c466 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Aug 2016 22:18:06 -0500 Subject: [PATCH] glew110: fix darwin build --- pkgs/development/libraries/glew/1.10.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 8f153baf6cd..9d5ded5be15 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi +, AGL ? null }: with stdenv.lib; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ x11 libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; 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 c0b6cba4958..ce4d10b74ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7353,7 +7353,9 @@ in gle = callPackage ../development/libraries/gle { }; glew = callPackage ../development/libraries/glew { }; - glew110 = callPackage ../development/libraries/glew/1.10.nix { }; + glew110 = callPackage ../development/libraries/glew/1.10.nix { + inherit (darwin.apple_sdk.frameworks) AGL; + }; glfw = self.glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };