* "!isNull x" -> "x != null". Done automatically. Hope nothing
broke. svn path=/nixpkgs/trunk/; revision=870
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
{stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl
|
||||
&& !isNull glib && !isNull gtk
|
||||
&& !isNull libxml2 && !isNull ORBit2 && !isNull popt;
|
||||
assert pkgconfig != null && perl != null
|
||||
&& glib != null && gtk != null
|
||||
&& libxml2 != null && ORBit2 != null && popt != null;
|
||||
|
||||
derivation {
|
||||
name = "GConf-2.4.0.1";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, pkgconfig, glib, libIDL, popt}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull glib && !isNull libIDL
|
||||
&& !isNull popt;
|
||||
assert pkgconfig != null && glib != null && libIDL != null
|
||||
&& popt != null;
|
||||
|
||||
derivation {
|
||||
name = "ORBit2-2.8.3";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, audiofile}:
|
||||
|
||||
assert !isNull audiofile;
|
||||
assert audiofile != null;
|
||||
|
||||
derivation {
|
||||
name = "esound-0.2.32";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, pkgconfig, perl}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl;
|
||||
assert pkgconfig != null && perl != null;
|
||||
|
||||
derivation {
|
||||
name = "gnome-mime-data-2.4.0";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
|
||||
, libbonobo, gnomemimedata, popt, bzip2 }:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl && !isNull glib
|
||||
&& !isNull libxml2 && !isNull GConf && !isNull libbonobo
|
||||
&& !isNull gnomemimedata && !isNull bzip2;
|
||||
assert pkgconfig != null && perl != null && glib != null
|
||||
&& libxml2 != null && GConf != null && libbonobo != null
|
||||
&& gnomemimedata != null && bzip2 != null;
|
||||
|
||||
derivation {
|
||||
name = "gnome-vfs-2.4.1";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, pkgconfig, glib, lex, yacc}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull glib && !isNull lex && !isNull yacc;
|
||||
assert pkgconfig != null && glib != null && lex != null && yacc != null;
|
||||
|
||||
derivation {
|
||||
name = "libIDL-0.8.2";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, pkgconfig, perl, ORBit2, libxml2, popt, yacc, flex}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl && !isNull ORBit2
|
||||
&& !isNull libxml2 && !isNull popt && !isNull yacc && !isNull flex;
|
||||
assert pkgconfig != null && perl != null && ORBit2 != null
|
||||
&& libxml2 != null && popt != null && yacc != null && flex != null;
|
||||
|
||||
derivation {
|
||||
name = "libbonobo-2.4.2";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{stdenv, fetchurl, pkgconfig, perl, libxml2, libglade, libgnome
|
||||
, libgnomecanvas}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl && !isNull libxml2
|
||||
&& !isNull libglade && !isNull libgnome && !isNull libgnomecanvas;
|
||||
assert pkgconfig != null && perl != null && libxml2 != null
|
||||
&& libglade != null && libgnome != null && libgnomecanvas != null;
|
||||
|
||||
derivation {
|
||||
name = "libbonoboui-2.4.1";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, pkgconfig, gtk, libxml2}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull gtk && !isNull libxml2;
|
||||
assert pkgconfig != null && gtk != null && libxml2 != null;
|
||||
|
||||
derivation {
|
||||
name = "libglade-2.0.1";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, glib, gnomevfs, libbonobo
|
||||
, GConf, popt, zlib }:
|
||||
|
||||
assert !isNull pkgconfig && !isNull perl && !isNull glib
|
||||
&& !isNull gnomevfs && !isNull libbonobo && !isNull GConf
|
||||
&& !isNull popt && !isNull zlib;
|
||||
assert pkgconfig != null && perl != null && glib != null
|
||||
&& gnomevfs != null && libbonobo != null && GConf != null
|
||||
&& popt != null && zlib != null;
|
||||
|
||||
# !!! TO CHECK:
|
||||
# libgnome tries to install stuff into GConf (which fails):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, pkgconfig, gtk, libart, libglade}:
|
||||
|
||||
assert !isNull pkgconfig && !isNull gtk && !isNull libart
|
||||
&& !isNull libglade;
|
||||
assert pkgconfig != null && gtk != null && libart != null
|
||||
&& libglade != null;
|
||||
|
||||
derivation {
|
||||
name = "libgnomecanvas-2.4.0";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libgnome, libgnomecanvas, libbonoboui, libglade }:
|
||||
|
||||
assert !isNull pkgconfig && !isNull libgnome && !isNull libgnomecanvas
|
||||
&& !isNull libbonoboui && !isNull libglade;
|
||||
assert pkgconfig != null && libgnome != null && libgnomecanvas != null
|
||||
&& libbonoboui != null && libglade != null;
|
||||
|
||||
derivation {
|
||||
name = "libgnomeui-2.4.0.1";
|
||||
|
||||
Reference in New Issue
Block a user