BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mesa: create a buildEnv that joins mesa (without glu) and glu

Browse source 
Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using
buildEnv to create a mesa environment that acts like old mesa, which is what
this commit does.
This commit is contained in:
Carles Pagès 2013-03-24 12:36:33 +01:00
parent 3a157d2c6c
commit 68be54c8e2
3 changed files with 6 additions and 4 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 ]; buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ mesa_noglu ]; propagatedBuildInputs = [ mesa_noglu ];
passthru = { inherit (mesa_noglu) libdrm; inherit mesa_noglu; };
meta = { meta = {
description = "OpenGL utility library"; description = "OpenGL utility library";
homepage = http://cgit.freedesktop.org/mesa/glu/; homepage = http://cgit.freedesktop.org/mesa/glu/;

2
pkgs/development/libraries/mesa/default.nix
View file

@ -12,7 +12,7 @@ let
version = "9.1.1"; version = "9.1.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mesa-${version}"; name = "mesa-noglu-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";

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

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