* Fix evaluation errors.

svn path=/nixpkgs/trunk/; revision=29955
This commit is contained in:
Eelco Dolstra
2011-10-21 14:43:18 +00:00
parent 11d18ba4fd
commit 5e51aadc10
4 changed files with 19 additions and 19 deletions
@@ -1,9 +1,11 @@
{ stdenv, fetchurl,
GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib,
gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2,
lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg,
libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb,
openexr, pixman, pkgconfig, sqlite}:
{ stdenv, fetchurl
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -14,11 +16,12 @@ stdenv.mkDerivation rec {
sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
};
buildInputs = [
GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite];
buildInputs =
[ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite
];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"