From a66723d4bf4f66e5725b48eb64def872185eb3bf Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 11 Mar 2023 20:57:10 +0000 Subject: [PATCH] auto-multiple-choice: create pkgs fixpoint for texlive using mkDerivation --- .../misc/auto-multiple-choice/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 8617e345423..d811540e589 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -23,14 +23,13 @@ , poppler , auto-multiple-choice }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; version = "1.5.2"; src = fetchurl { url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz"; sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM="; }; - tlType = "run"; # There's only the Makefile dontConfigure = true; @@ -137,6 +136,11 @@ stdenv.mkDerivation rec { XMLWriter ]); + passthru = { + tlType = "run"; + pkgs = [ finalAttrs.finalPackage ]; + }; + meta = with lib; { description = "Create and manage multiple choice questionnaires with automated marking."; longDescription = '' @@ -156,10 +160,7 @@ stdenv.mkDerivation rec { auto-multiple-choice (texlive.combine { inherit (pkgs.texlive) scheme-full; - extra = - { - pkgs = [ auto-multiple-choice ]; - }; + inherit auto-multiple-choice; }) ]; @@ -172,4 +173,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.thblt ]; platforms = platforms.all; }; -} +})