Author: eelco
Date: Fri Oct 21 14:43:18 2011
New Revision: 29955
URL: https://nixos.org/websvn/nix/?rev=29955&sc=1
Log:
* Fix evaluation errors.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix
nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix
nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix Fri Oct
21 14:12:46 2011 (r29954)
+++ nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix Fri Oct
21 14:43:18 2011 (r29955)
@@ -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 @@
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"
Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Fri Oct 21
14:12:46 2011 (r29954)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Fri Oct 21
14:43:18 2011 (r29955)
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, perl, groff, llvm }:
+assert stdenv.isLinux;
+
let version = "2.9"; in
stdenv.mkDerivation {
Modified: nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Fri Oct 21
14:12:46 2011 (r29954)
+++ nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Fri Oct 21
14:43:18 2011 (r29955)
@@ -20,9 +20,7 @@
'';
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 ];
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 21 14:12:46
2011 (r29954)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 21 14:43:18
2011 (r29955)
@@ -1663,10 +1663,7 @@
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 { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
