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/top-level | |
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/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
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; }; |