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

Merge pull request #405 from cpages/mesafix

Browse Source 
mesa: use buildEnv to join mesa(noglu) and glu
This commit is contained in:
Vladimír Čunát 2013-03-28 02:04:35 -07:00
commit 4ee055d359
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/mesa-glu/default.nix
View File

@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ mesa_noglu ];
passthru = { inherit (mesa_noglu) libdrm; inherit mesa_noglu; };
meta = {
description = "OpenGL utility library";
homepage = http://cgit.freedesktop.org/mesa/glu/;

4
pkgs/development/libraries/mesa/default.nix
View File

@ -12,7 +12,7 @@ let
version = "9.1.1";
in
stdenv.mkDerivation {
name = "mesa-${version}";
name = "mesa-noglu-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
@ -42,7 +42,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru = { inherit libdrm; };
passthru = { inherit libdrm; inherit version; };
meta = {
description = "An open source implementation of OpenGL";

2
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
SEARCH_LIB =
"${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib "
+ optionalString withMesa "${mesa.mesa_noglu}/lib ${mesa}/lib ";
+ optionalString withMesa "${mesa}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";

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

@ -4565,8 +4565,12 @@ let
mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
mesa_noglu = callPackage ../development/libraries/mesa { };
mesa_glu = callPackage ../development/libraries/mesa-glu { };
mesa = if stdenv.isDarwin then darwinX11AndOpenGL
else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
else buildEnv {
name = "mesa-${mesa_noglu.version}";
paths = [ mesa_glu mesa_noglu ];
};
darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {