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

mesa: make the attribute include the GL/glu.h

Browse Source 
Packages expect it and it used to be true until mesa-9*.
This seems to be the easiest fix, otherwise many changes would be needed.
This commit is contained in:
Vladimír Čunát 2013-01-31 22:44:31 +01:00
parent d85a587fdd
commit aa0fb73064
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/SDL/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, audiofile { stdenv, fetchurl, pkgconfig, audiofile
, openglSupport ? false, mesa ? null, mesa_glu ? null , openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, x11Support ? true, x11 ? null, libXrandr ? null , x11Support ? true, x11 ? null, libXrandr ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, pulseaudio ? null
@ -9,7 +9,7 @@
# PulseAudio. # PulseAudio.
assert alsaSupport || pulseaudioSupport; assert alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa != null && mesa_glu != null && x11Support); assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null); assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> pulseaudio != null;
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional pulseaudioSupport pulseaudio; stdenv.lib.optional pulseaudioSupport pulseaudio;
buildInputs = [ pkgconfig audiofile ] ++ buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport [ mesa mesa_glu ] ++ stdenv.lib.optional openglSupport [ mesa ] ++
stdenv.lib.optional alsaSupport alsaLib; stdenv.lib.optional alsaSupport alsaLib;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case # XXX: By default, SDL wants to dlopen() PulseAudio, in which case

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, mesa_glu, x11 }: { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "freeglut-2.8.0"; name = "freeglut-2.8.0";
@ -10,6 +10,6 @@ stdenv.mkDerivation {
configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings"; configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings";
buildInputs = [ libXi libXrandr libXxf86vm mesa mesa_glu x11 ]; buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ];
patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ]; patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, mesa }: { stdenv, fetchurl, pkgconfig, mesa_noglu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glu-9.0.0"; name = "glu-9.0.0";
@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz";
}; };
buildInputs = [ pkgconfig mesa ]; buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ mesa_noglu ];
passthru = { inherit (mesa_noglu) libdrm; };
meta = { meta = {
description = "OpenGL utility library"; description = "OpenGL utility library";

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

@ -4598,9 +4598,8 @@ let
mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
mesa = callPackage ../development/libraries/mesa { }; mesa_noglu = callPackage ../development/libraries/mesa { };
mesa = callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
mesa_glu = callPackage ../development/libraries/mesa-glu { };
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };