Author: ludo
Date: Mon Sep 6 07:58:17 2010
New Revision: 23658
URL: https://svn.nixos.org/websvn/nix/?rev=23658&sc=1
Log:
Fix references to the `guileLib' attribute, now `guile_lib'.
Modified:
nixpkgs/trunk/pkgs/development/guile-modules/guile-cairo/default.nix
nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
nixpkgs/trunk/pkgs/development/tools/guile/g-wrap/default.nix
Modified: nixpkgs/trunk/pkgs/development/guile-modules/guile-cairo/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/guile-modules/guile-cairo/default.nix
Mon Sep 6 07:58:13 2010 (r23657)
+++ nixpkgs/trunk/pkgs/development/guile-modules/guile-cairo/default.nix
Mon Sep 6 07:58:17 2010 (r23658)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, pkgconfig, cairo, guileLib }:
+{ fetchurl, stdenv, guile, pkgconfig, cairo, guile_lib }:
stdenv.mkDerivation rec {
name = "guile-cairo-1.4.0";
@@ -9,7 +9,7 @@
};
buildInputs = [ guile pkgconfig cairo ]
- ++ stdenv.lib.optional doCheck guileLib;
+ ++ stdenv.lib.optional doCheck guile_lib;
doCheck = true;
Modified: nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
Mon Sep 6 07:58:13 2010 (r23657)
+++ nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
Mon Sep 6 07:58:17 2010 (r23658)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, guileLib, gwrap
+{ fetchurl, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnomevfs, gtk
, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
@@ -15,7 +15,7 @@
pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas
libgnomeui pango guileCairo
]
- ++ stdenv.lib.optional doCheck guileLib;
+ ++ stdenv.lib.optional doCheck guile_lib;
# The test suite tries to open an X display, which fails.
doCheck = false;
Modified: nixpkgs/trunk/pkgs/development/tools/guile/g-wrap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/guile/g-wrap/default.nix Mon Sep
6 07:58:13 2010 (r23657)
+++ nixpkgs/trunk/pkgs/development/tools/guile/g-wrap/default.nix Mon Sep
6 07:58:17 2010 (r23658)
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib
-, guileLib }:
+, guile_lib }:
stdenv.mkDerivation rec {
name = "g-wrap-1.9.13";
@@ -11,7 +11,7 @@
# Note: Glib support is optional, but it's quite useful (e.g., it's
# used by Guile-GNOME).
buildInputs = [ guile pkgconfig glib ]
- ++ stdenv.lib.optional doCheck guileLib;
+ ++ stdenv.lib.optional doCheck guile_lib;
propagatedBuildInputs = [ libffi ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
