From 7aa7245620eb0b198b89cb9f406b4ad08c8bcc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 8 Mar 2012 10:12:02 +0000 Subject: [PATCH] Trying to get go_oo pick perl510 packages for what it needs. svn path=/nixpkgs/trunk/; revision=32882 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7f959be1096..da860d45228e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4929,6 +4929,10 @@ let inherit pkgs; }); + perl510Packages = recurseIntoAttrs (import ./perl-packages.nix { + pkgs = pkgs // { perl = perl510; }; + }); + perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; @@ -7121,7 +7125,7 @@ let }; go_oo = callPackage ../applications/office/openoffice/go-oo.nix { - inherit (perlPackages) ArchiveZip CompressZlib; + inherit (perl510Packages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08;