diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 18:03:41 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 18:03:41 +0000 |
| commit | cced3d2b8640bb24beb9ea212ead8e33b802d98e (patch) | |
| tree | 7179af32fdfc2316f3763722b7182ea94baec671 /pkgs/applications | |
| parent | 77c66485355b8868171237cecbb82e6878b86e28 (diff) | |
| download | nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar.gz nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar.bz2 nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar.lz nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar.xz nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.tar.zst nixlib-cced3d2b8640bb24beb9ea212ead8e33b802d98e.zip | |
Fix compilation with qt-4.8
- Explicitly depend on libX11 and mesa - Include GL/glu.h svn path=/nixpkgs/trunk/; revision=31552
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/chemistry/avogadro/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index b3e2e2101004..b444783ba21d 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: stdenv.mkDerivation rec { name = "avogadro-1.0.3"; @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; }; - buildInputs = [ qt4 eigen zlib openbabel ]; + buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; buildNativeInputs = [ cmake pkgconfig ]; + NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; + meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; inherit (qt4.meta) platforms; |