diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index dfe5e8721607..4d24206b43ee 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ --prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \ - --prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R \ - --prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3 + ${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \ + ${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"} ''; installPhase = '' @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://quarto.org/"; changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mrtarantoga ]; + maintainers = with maintainers; [ minijackson mrtarantoga ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 198d1decb156..f4c20c57839c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23722,6 +23722,8 @@ with pkgs; quarto = callPackage ../development/libraries/quarto { }; + quartoMinimal = callPackage ../development/libraries/quarto { rWrapper = null; python3 = null; }; + qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 {