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

* Set PERL5LIB automatically in the Perl setup hook.

Browse Source 
* Remove explicit setting of PERL5LIB.
* Use the generic Perl builder for the BerkeleyDB and XML::Parser
  modules.
* Prefix all names of Perl modules with `perl-' (in the generic Perl
  builder).

svn path=/nixpkgs/trunk/; revision=2365
This commit is contained in:
Eelco Dolstra
2005-03-10 12:49:37 +00:00
parent 93e16516a7
commit 8a282aa46c
33 changed files with 91 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gnome/gnome-desktop/default.nix
View File

@@ -4,6 +4,5 @@
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl gtk glib libgnomeui scrollkeeper libjpeg];
PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
buildInputs = [pkgconfig perl perlXMLParser gtk glib libgnomeui scrollkeeper libjpeg];
}

2
pkgs/development/libraries/gnome/gnome-icon-theme/default.nix
View File

@@ -8,6 +8,4 @@ stdenv.mkDerivation {
# TODO: maybe this package as dependency on gnome-themes?
configureFlags = "--disable-hicolor-check";
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

3
pkgs/development/libraries/gnome/gnome-mime-data/default.nix
View File

@@ -5,7 +5,4 @@ assert pkgconfig != null && perl != null;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

3
pkgs/development/libraries/gnome/gnome-panel/default.nix
View File

@@ -6,9 +6,8 @@
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
pkgconfig perl gtk glib ORBit2 libgnome libgnomeui
pkgconfig perl perlXMLParser gtk glib ORBit2 libgnome libgnomeui
gnomedesktop libglade libwnck libjpeg libpng scrollkeeper
libXmu
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
}

1
pkgs/development/libraries/gnome/gnome-vfs/default.nix
View File

@@ -11,6 +11,5 @@ stdenv.mkDerivation {
pkgconfig perl glib libxml2 gconf libbonobo
gnomemimedata popt bzip2 perlXMLParser
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
patches = [./no-kerberos.patch];
}

22
pkgs/development/libraries/gnome/gtkhtml/default.nix
View File

@@ -3,26 +3,14 @@
# TODO build complains about missing libsoup and soup. Optional dependency?
assert
null != pkgconfig
&& null != perl
&& null != perlXMLParser
&& null != pkgconfig
&& null != atk
&& null != gail
&& null != gtk
;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
perl perlXMLParser pkgconfig libjpeg
atk gail gtk
libglade libgnomeprint libgnomeprintui libgnomeui
gnomeicontheme
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
perl perlXMLParser pkgconfig libjpeg
atk gail gtk
libglade libgnomeprint libgnomeprintui libgnomeui
gnomeicontheme
];
}

1
pkgs/development/libraries/gnome/gtksourceview/default.nix
View File

@@ -10,5 +10,4 @@ stdenv.mkDerivation {
libbonobo gconf libgnomeprintui libgnomecanvas
];
propagatedBuildInputs = [gtk libxml2 libgnomeprint];
PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
}

1
pkgs/development/libraries/gnome/intltool/default.nix
View File

@@ -3,5 +3,4 @@
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

3
pkgs/development/libraries/gnome/libbonobo/default.nix
View File

@@ -6,7 +6,6 @@ assert pkgconfig != null && perl != null && ORBit2 != null
# todo 2.8.1 doesn;t work
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl libxml2 yacc flex];
buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex];
propagatedBuildInputs = [ORBit2 popt];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

8
pkgs/development/libraries/gnome/libbonoboui/default.nix
View File

@@ -4,13 +4,11 @@
assert pkgconfig != null && perl != null && libxml2 != null
&& libglade != null && libgnome != null && libgnomecanvas != null;
# todo 2.8.1 doesn;t work
# TODO 2.8.1 doesn't work
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl libglade gettext];
buildInputs = [pkgconfig perl perlXMLParser libglade gettext];
propagatedBuildInputs = [libxml2 libgnome libgnomecanvas];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
LDFLAGS="-lglib-2.0";
LDFLAGS="-lglib-2.0"; # !!! why?
}

2
pkgs/development/libraries/gnome/libgnome/default.nix
View File

@@ -14,6 +14,4 @@ stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser popt zlib];
propagatedBuildInputs = [glib gnomevfs libbonobo gconf];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

8
pkgs/development/libraries/gnome/libgnomeprint/default.nix
View File

@@ -4,11 +4,9 @@ stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
perl perlXMLParser pkgconfig popt libxml2
glib pango
];
perl perlXMLParser pkgconfig popt libxml2
glib pango
];
propagatedBuildInputs = [libxml2 libart];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
}

8
pkgs/development/libraries/gnome/libgnomeprintui/default.nix
View File

@@ -4,9 +4,7 @@ stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
perl perlXMLParser pkgconfig
gtk libgnomeprint libgnomecanvas gnomeicontheme
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
perl perlXMLParser pkgconfig
gtk libgnomeprint libgnomecanvas gnomeicontheme
];
}

6
pkgs/development/libraries/gnome/libgtkhtml/default.nix
View File

@@ -10,9 +10,7 @@ stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
perl perlXMLParser pkgconfig gtk libxml2 gail
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
perl perlXMLParser pkgconfig gtk libxml2 gail
];
}

1
pkgs/development/libraries/gnome/libwnck/default.nix
View File

@@ -3,5 +3,4 @@
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig gtk];
# PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
}

3
pkgs/development/libraries/gnome/scrollkeeper/default.nix
View File

@@ -5,8 +5,7 @@
stdenv.mkDerivation {
inherit (input) name src;
patches = [./xmlcatalog.patch];
buildInputs = [pkgconfig perl libxml2 libxslt];
PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
inherit docbook_xml_dtd_42;
builder = ./builder.sh;
}