public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix references to the guileLib' attribute, now guile_lib'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=23658
This commit is contained in:
Ludovic Courtès 2010-09-06 07:58:17 +00:00
parent 78adb9fbf1
commit f2b9328a31
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/guile-modules/guile-cairo/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, pkgconfig, cairo, guileLib }: { fetchurl, stdenv, guile, pkgconfig, cairo, guile_lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-cairo-1.4.0"; name = "guile-cairo-1.4.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ guile pkgconfig cairo ] buildInputs = [ guile pkgconfig cairo ]
++ stdenv.lib.optional doCheck guileLib; ++ stdenv.lib.optional doCheck guile_lib;
doCheck = true; doCheck = true;

4
pkgs/development/guile-modules/guile-gnome/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, guileLib, gwrap { fetchurl, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnomevfs, gtk , pkgconfig, gconf, glib, gnomevfs, gtk
, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }: , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas
libgnomeui pango guileCairo 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. # The test suite tries to open an X display, which fails.
doCheck = false; doCheck = false;

4
pkgs/development/tools/guile/g-wrap/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib { fetchurl, stdenv, guile, libffi, pkgconfig, glib
, guileLib }: , guile_lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "g-wrap-1.9.13"; 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 # Note: Glib support is optional, but it's quite useful (e.g., it's
# used by Guile-GNOME). # used by Guile-GNOME).
buildInputs = [ guile pkgconfig glib ] buildInputs = [ guile pkgconfig glib ]
++ stdenv.lib.optional doCheck guileLib; ++ stdenv.lib.optional doCheck guile_lib;
propagatedBuildInputs = [ libffi ]; propagatedBuildInputs = [ libffi ];