Trying to get go_oo pick perl510 packages for what it needs.
svn path=/nixpkgs/trunk/; revision=32882
This commit is contained in:
parent
bb724044b6
commit
7aa7245620
@ -4929,6 +4929,10 @@ let
|
|||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
perl510Packages = recurseIntoAttrs (import ./perl-packages.nix {
|
||||||
|
pkgs = pkgs // { perl = perl510; };
|
||||||
|
});
|
||||||
|
|
||||||
perlXMLParser = perlPackages.XMLParser;
|
perlXMLParser = perlPackages.XMLParser;
|
||||||
|
|
||||||
ack = perlPackages.ack;
|
ack = perlPackages.ack;
|
||||||
@ -7121,7 +7125,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
|
go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
|
||||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
inherit (perl510Packages) ArchiveZip CompressZlib;
|
||||||
inherit (gnome) GConf ORBit2;
|
inherit (gnome) GConf ORBit2;
|
||||||
neon = neon029;
|
neon = neon029;
|
||||||
libwpd = libwpd_08;
|
libwpd = libwpd_08;
|
||||||
|
Loading…
Reference in New Issue
Block a user