Merge pull request #13014 from Pamelloes/master

pyrox.dev / nixpkgs

fork atom

lol

fork atom

Darwin Fixes for Mesa and Freeglut

authored by

Benjamin Staffin and committed by

GitHub 9 years ago 2fcd26c7 8a19caac

+10

2 changed files

expand all

pkgs

development

libraries

freeglut

default.nix

mesa-darwin

default.nix

pkgs/development/libraries/freeglut/default.nix

··· 11 11 12 12 buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; 13 13 14 + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ 15 + "-DOPENGL_INCLUDE_DIR=${mesa}/include" 16 + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" 17 + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" 18 + "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" 19 + "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" 20 + ]; 21 + 14 22 meta = with stdenv.lib; { 15 23 description = "Create and manage windows containing OpenGL contexts"; 16 24 longDescription = ''

pkgs/development/libraries/mesa-darwin/default.nix

··· 25 25 libffi libvdpau 26 26 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ]; 27 27 28 + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; 29 + 28 30 postUnpack = '' 29 31 ln -s darwin $sourceRoot/configs/current 30 32 '';