alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Fix evaluation errors.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/graphics/darktable/default.nix
View file

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

2
pkgs/development/compilers/llvm/clang.nix
View file

@ -1,5 +1,7 @@
{ stdenv, fetchurl, perl, groff, llvm }:
assert stdenv.isLinux;
let version = "2.9"; in
stdenv.mkDerivation {

6
pkgs/development/libraries/yajl/default.nix
View file

@ -20,9 +20,7 @@ stdenv.mkDerivation {
'';
homepage = http://lloyd.github.com/yajl/;
license = stdenv.lib.licenses.isc;
platforms = with stdenv.lib.platforms; [ linux darwin ];
maintainers = with stdenv.lib.maintainers; [
z77z
];
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ z77z ];
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -1663,10 +1663,7 @@ let
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
dylan = callPackage ../development/compilers/gwydion-dylan {
dylan =
import ../development/compilers/gwydion-dylan/binary.nix {
inherit fetchurl stdenv;
};
dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { };
};
ecl = callPackage ../development/compilers/ecl { };