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/development/libraries/freeglut | |
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/development/libraries/freeglut')
-rw-r--r-- | pkgs/development/libraries/freeglut/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 ]; } |