From aaaa1af4a5cde74aaf4f3ba425efaf93613acb39 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 15 Jan 2022 14:52:50 +0100 Subject: [PATCH 1/2] perlPackages.OpenOfficeOODoc: init at 2.125 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8cdd09e544f..a081a064120c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17024,6 +17024,20 @@ let doCheck = false; }; + OpenOfficeOODoc = buildPerlPackage { + pname = "OpenOffice-OODoc"; + version = "2.125"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMGDOC/OpenOffice-OODoc-2.125.tar.gz"; + sha256 = "1dnsj63svxq0hi3aci4x7binql8kr754inlkks5jmi4k0sblh561"; + }; + propagatedBuildInputs = [ ArchiveZip XMLTwig ]; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ maintainers.wentasah ]; + }; + }; + NetOpenIDCommon = buildPerlPackage { pname = "Net-OpenID-Common"; version = "1.20"; From 960ef9fe03124e254a7d82084ec6f8e378201e73 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 15 Jan 2022 14:53:21 +0100 Subject: [PATCH 2/2] auto-multiple-choice: add OpenOfficeOODoc as dependency Without this, AMC cannot export the results to OpenOffice. When one presses "Reports->OpenOffice->Export", a dialog appears saying that OpenOffice::OODoc perl module is not installed. We switch to using makeFullPerlPath to make dependencies of OpenOfficeOODoc also available. Without this, export complains about missing XMLTwig. --- pkgs/applications/misc/auto-multiple-choice/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 3f8edac97b6f..9652198e06f4 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/auto-multiple-choice \ ''${makeWrapperArgs[@]} \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ArchiveZip DBDSQLite Cairo @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { GlibObjectIntrospection Gtk3 LocaleGettext + OpenOfficeOODoc PerlMagick TextCSV XMLParser