From f2b9328a31a6c959d8372f88a9a8a57e2af4aa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 Sep 2010 07:58:17 +0000 Subject: [PATCH] Fix references to the `guileLib' attribute, now `guile_lib'. svn path=/nixpkgs/trunk/; revision=23658 --- pkgs/development/guile-modules/guile-cairo/default.nix | 4 ++-- pkgs/development/guile-modules/guile-gnome/default.nix | 4 ++-- pkgs/development/tools/guile/g-wrap/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index d4deea047ef..f8ff52e5ab8 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -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 @@ stdenv.mkDerivation rec { }; buildInputs = [ guile pkgconfig cairo ] - ++ stdenv.lib.optional doCheck guileLib; + ++ stdenv.lib.optional doCheck guile_lib; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 40074e743b1..b6a7a43297c 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index fe926e8ace5..8698dc27b40 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -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 @@ stdenv.mkDerivation rec { # 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 ];