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

perlXMLParser -> perlPackages.XMLParser

Browse Source
This commit is contained in:
volth 2018-10-12 22:56:15 +00:00
parent ef93155f60
commit c0fed1ba77
20 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag,
gnome3, gtk3, gettext, perlPackages, flex, libid3tag,
libvorbis, gdk_pixbuf }:
stdenv.mkDerivation rec {
@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
curl gettext perl perlXMLParser
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
];
] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh

10
pkgs/applications/audio/jamin/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
, makeWrapper, pkgconfig, perl, perlXMLParser
, makeWrapper, pkgconfig, perlPackages
}:
stdenv.mkDerivation {
@ -11,11 +11,9 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
perlXMLParser makeWrapper
];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
'';

8
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
libexif zlib libX11 python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];
] ++ (with perlPackages; [ perl XMLParser ]);
hardeningDisable = [ "format" ];

9
pkgs/applications/graphics/dia/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages,
libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration }:
@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
[ gtk2 libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
++ stdenv.lib.optional withGNOME libgnomeui
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]
++ (with perlPackages; [ perl XMLParser ]);
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough

5
pkgs/applications/graphics/gcolor2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } :
{stdenv, fetchurl, gtk2, perlPackages, pkgconfig } :
let version = "0.4"; in
stdenv.mkDerivation {
@ -21,7 +21,8 @@ stdenv.mkDerivation {
[ ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 perl perlXMLParser ];
buildInputs = [ gtk2 ]
++ (with perlPackages; [ perl XMLParser ]);
meta = {
description = "Simple GTK+2 color selector";

5
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
{ stdenv, fetchurl, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ];
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [
libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext

7
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
perl perlXMLParser evolution-data-server gnome-doc-utils avahi
evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
gmp nettle makeWrapper ];
gmp nettle makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""

7
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gst_all_1, startupnotification, gettext
, perl, perlXMLParser, libxml2, nss, nspr, farstream
, perlPackages, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM
, cyrus_sasl ? null
@ -40,9 +40,8 @@ let unwrapped = stdenv.mkDerivation rec {
++ (lib.optional (gnutls != null) gnutls)
++ (lib.optional (libgcrypt != null) libgcrypt);
propagatedBuildInputs = [
pkgconfig gtk2 perl perlXMLParser gettext
];
propagatedBuildInputs = [ pkgconfig gtk2 gettext ]
++ (with perlPackages; [ perl XMLParser ]);
patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];

12
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
, itstool
}:
@ -20,19 +20,19 @@ in stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace doc/C/gnumeric.xml \
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
'';
nativeBuildInputs = [ pkgconfig ];
# ToDo: optional libgda, introspection?
buildInputs = [
intltool perl perlXMLParser bison
intltool bison
goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3 itstool
];
] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;

5
pkgs/applications/video/kino/default.nix
View File

@ -51,7 +51,7 @@
#AMR-WB IF2 support no
{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv
, pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext
, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext
, libX11, glib, cairo, intltool, ffmpeg, libv4l
}:
@ -64,7 +64,8 @@ stdenv.mkDerivation {
};
buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv
pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages
pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--enable-local-ffmpeg=no" ];

10
pkgs/applications/video/wxcam/default.nix
View File

@ -4,7 +4,7 @@
, libX11, libXv, libSM
, gtk, libglade
, wxGTK
, perlXMLParser
, perlPackages
, xvidcore
, mjpegtools
, alsaLib
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
[ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";
@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
installPhase = ''
make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam"
'';
'';
meta = with stdenv.lib; {
description = "An open-source, wxGTK-based webcam app for Linux";
description = "An open-source, wxGTK-based webcam app for Linux";
longDescription = ''
wxCam is a webcam application for linux. It supports video recording
(avi uncompressed and Xvid formats), snapshot taking, and some special

10
pkgs/applications/video/xvidcap/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2
{ stdenv, fetchurl, perlPackages, pkgconfig, gtk2
, scrollkeeper, libglade, libXmu, libX11, libXext, gettext
, lame, libXfixes, libXdamage }:
stdenv.mkDerivation {
name = "xvidcap-1.1.7";
src = fetchurl {
url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz;
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
@ -14,14 +14,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
perl perlXMLParser gtk2 scrollkeeper
gtk2 scrollkeeper
libglade libXmu gettext lame libXdamage libXfixes libXext libX11
];
] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
meta = with stdenv.lib; {
meta = with stdenv.lib; {
description = "Screencast video catpuring tool";
homepage = http://xvidcap.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;

6
pkgs/data/misc/shared-mime-info/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
, libxml2, glib}:
let version = "1.10"; in
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig gettext intltool perl perlXMLParser libxml2 glib
];
pkgconfig gettext intltool libxml2 glib
] ++ (with perlPackages; [ perl XMLParser ]);
meta = with stdenv.lib; {
inherit version;

5
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
@ -14,6 +14,7 @@ stdenv.mkDerivation {
";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
buildInputs = [ libxml2 libxslt gettext ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
}

5
pkgs/development/libraries/avahi/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, qt4 ? null
, qt4Support ? false
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ];
buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
buildInputs = [ libdaemon dbus glib expat libiconv ]
++ (with perlPackages; [ perl XMLParser ])
++ (stdenv.lib.optional qt4Support qt4);
nativeBuildInputs = [ pkgconfig gettext intltool glib ];

22
pkgs/development/libraries/libgksu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
libstartup_notification, libgtop, perl, perlXMLParser,
libstartup_notification, libgtop, perlPackages,
autoreconfHook, intltool, docbook_xsl, xauth
}:
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 gnome2.GConf libstartup_notification
gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser
];
gnome3.libgnome-keyring libgtop gnome2.libglade
] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;
@ -30,26 +30,26 @@ stdenv.mkDerivation rec {
# Patches from the gentoo ebuild
# Fix compilation on bsdc
./libgksu-2.0.0-fbsd.patch
./libgksu-2.0.0-fbsd.patch
# Fix wrong usage of LDFLAGS, gentoo bug #226837
./libgksu-2.0.7-libs.patch
./libgksu-2.0.7-libs.patch
# Use po/LINGUAS
./libgksu-2.0.7-polinguas.patch
./libgksu-2.0.7-polinguas.patch
# Don't forkpty; gentoo bug #298289
./libgksu-2.0.12-revert-forkpty.patch
./libgksu-2.0.12-revert-forkpty.patch
# Make this gmake-3.82 compliant, gentoo bug #333961
./libgksu-2.0.12-fix-make-3.82.patch
./libgksu-2.0.12-fix-make-3.82.patch
# Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues).
./libgksu-2.0.12-notests.patch
./libgksu-2.0.12-notests.patch
# Fix automake-1.11.2 compatibility, gentoo bug #397411
./libgksu-2.0.12-automake-1.11.2.patch
];
./libgksu-2.0.12-automake-1.11.2.patch
];
postPatch = ''
# gentoo bug #467026

7
pkgs/development/libraries/libgpod/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
libimobiledevice, pythonPackages, mutagen,
monoSupport ? true, mono, gtk-sharp-2_0
@ -25,8 +25,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++
lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
nativeBuildInputs = [ gettext intltool pkgconfig ]
++ (with perlPackages; [ perl XMLParser ])
++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
meta = {
homepage = http://gtkpod.sourceforge.net/;

5
pkgs/development/libraries/rarian/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
let
pname = "rarian";
version = "0.8.1";
@ -11,7 +11,8 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl perlXMLParser libxml2 libxslt];
buildInputs = [ libxml2 libxslt ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
passthru = {

4
pkgs/development/tools/misc/intltool/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, gettext, perl, perlXMLParser }:
{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
stdenv.mkDerivation rec {
name = "intltool-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45";
})];
propagatedBuildInputs = [ gettext perl perlXMLParser ];
propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);
meta = with stdenv.lib; {
description = "Translation helper tool";

2
pkgs/top-level/all-packages.nix
View File

@ -12924,8 +12924,6 @@ with pkgs;
perlPackages = perl528Packages;
inherit (perlPackages) perl buildPerlPackage;
perlXMLParser = perlPackages.XMLParser;
ack = perlPackages.ack;
perlArchiveCpio = perlPackages.ArchiveCpio;