diff options
author | volth <volth@volth.com> | 2018-10-12 22:56:15 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-10-12 22:56:15 +0000 |
commit | c0fed1ba7740070cb20454d6aa77f087751a2a2b (patch) | |
tree | ed60b74a1d698af2234e6bd537f5af3ab836b2ae /pkgs/development | |
parent | ef93155f60284e7cd694ded81bd15f07997575bc (diff) | |
download | nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.gz nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.bz2 nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.lz nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.xz nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.tar.zst nixpkgs-c0fed1ba7740070cb20454d6aa77f087751a2a2b.zip |
perlXMLParser -> perlPackages.XMLParser
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libgksu/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libgpod/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/rarian/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/misc/intltool/default.nix | 4 |
5 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 53e3f5468ab..971637bc787 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 29f346e9acf..0af0a1227f3 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -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 diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 74aee0f39c7..f178af34908 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -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/; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index d0a15e866f7..bd79e3628a1 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -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 = { diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 67180b08f02..a9f451d31e7 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -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"; |