public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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, { stdenv, fetchurl
GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib, , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2, , gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg, , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb, , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
openexr, pixman, pkgconfig, sqlite}: , openexr, pixman, pkgconfig, sqlite }:
assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.1"; version = "0.9.1";
@ -14,11 +16,12 @@ stdenv.mkDerivation rec {
sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
}; };
buildInputs = [ buildInputs =
GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite]; librsvg libtiff libxcb openexr pixman pkgconfig sqlite
];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" 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 }: { stdenv, fetchurl, perl, groff, llvm }:
assert stdenv.isLinux;
let version = "2.9"; in let version = "2.9"; in
stdenv.mkDerivation { stdenv.mkDerivation {

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

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

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

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