From efac6d8e73bcac39f673eacc0d7b90a9fb0bb79c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 12:44:07 +0200 Subject: [PATCH] celestia: help the package find the gtk related libraries --- .../science/astronomy/celestia/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 5a399169c09..837fd2c2755 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext +, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo +, pango, gdk_pixbuf, atk }: let @@ -44,7 +45,7 @@ stdenv.mkDerivation { }; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua - perl automake autoconf libtool gettext ]; + perl automake autoconf libtool gettext ]; patchPhase = '' patch -Np0 -i "${gcc46Patch}" @@ -53,7 +54,13 @@ stdenv.mkDerivation { patch -Np1 -i "${linkingPatch}" patch -Np1 -i "${gcc47Patch}" autoreconf - configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" ) + configureFlagsArray=( + --with-gtk + --with-lua=${lua} + CPPFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" + CFLAGS="-O2 -fsigned-char" + CXXFLAGS="-O2 -fsigned-char" + ) ''; enableParallelBuilding = true;