public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glew110: fix darwin build

This commit is contained in:
Matthew Bauer 2016-08-11 22:18:06 -05:00
parent 5ba0165034
commit 0edb35ad78
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glew/1.10.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi
, AGL ? null }:
with stdenv.lib; with stdenv.lib;
@ -12,6 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ x11 libXmu libXi ]; nativeBuildInputs = [ x11 libXmu libXi ];
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ];
patchPhase = '' patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux sed -i 's|lib64|lib|' config/Makefile.linux

4
pkgs/top-level/all-packages.nix
View File

@ -7353,7 +7353,9 @@ in
gle = callPackage ../development/libraries/gle { }; gle = callPackage ../development/libraries/gle { };
glew = callPackage ../development/libraries/glew { }; 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; glfw = self.glfw3;
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };