mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 07:01:54 +00:00
Fix references to the guileLib' attribute, now
guile_lib'.
svn path=/nixpkgs/trunk/; revision=23658
This commit is contained in:
parent
78adb9fbf1
commit
f2b9328a31
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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 ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user