diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-01-31 22:44:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-01-31 22:44:31 +0100 |
commit | aa0fb7306430be2222aa89b88a060f80d7a023c0 (patch) | |
tree | 34a0b22178d8ad33b8dc2169830e399de3020a8b /pkgs | |
parent | d85a587fdd6aa031afa1dd1c71a8d4c518606464 (diff) | |
download | nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar.gz nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar.bz2 nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar.lz nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar.xz nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.tar.zst nixlib-aa0fb7306430be2222aa89b88a060f80d7a023c0.zip |
mesa: make the attribute include the GL/glu.h
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.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/freeglut/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa-glu/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
4 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 888502b1e648..a2847bac884a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa ? null, mesa_glu ? null +, openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null , pulseaudioSupport ? true, pulseaudio ? null @@ -9,7 +9,7 @@ # PulseAudio. assert alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa != null && mesa_glu != null && x11Support); +assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> pulseaudio != null; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional pulseaudioSupport pulseaudio; buildInputs = [ pkgconfig audiofile ] ++ - stdenv.lib.optional openglSupport [ mesa mesa_glu ] ++ + stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional alsaSupport alsaLib; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 09d6eda45ef2..9d599560fc80 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, mesa_glu, x11 }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }: stdenv.mkDerivation { name = "freeglut-2.8.0"; @@ -10,6 +10,6 @@ stdenv.mkDerivation { 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 ]; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 2bb0047da4a6..3a166b90e190 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mesa }: +{ stdenv, fetchurl, pkgconfig, mesa_noglu }: stdenv.mkDerivation rec { name = "glu-9.0.0"; @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; }; - buildInputs = [ pkgconfig mesa ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ mesa_noglu ]; + + passthru = { inherit (mesa_noglu) libdrm; }; meta = { description = "OpenGL utility library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be5e50d4def6..5270e445122e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4598,9 +4598,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa = callPackage ../development/libraries/mesa { }; - - mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa = callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; |