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

Fix compilation with qt-4.8 

- Explicitly depend on libX11 and mesa
- Include GL/glu.h

svn path=/nixpkgs/trunk/; revision=31552
This commit is contained in:
Yury G. Kudryashov 2012-01-14 18:03:41 +00:00
parent 77c6648535
commit cced3d2b86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/chemistry/avogadro/default.nix
View File

@ -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;