quarto: use --set instead of --prefix (#384080)

authored by Toma and committed by GitHub 90d3d27f 3ec8549e

+25 -24
+25 -24
pkgs/development/libraries/quarto/default.nix
··· 18 18 sysctl, 19 19 which, 20 20 }: 21 + 22 + let 23 + rWithPackages = rWrapper.override { 24 + packages = [ 25 + rPackages.rmarkdown 26 + ] ++ extraRPackages; 27 + }; 28 + 29 + pythonWithPackages = python3.withPackages ( 30 + ps: 31 + with ps; 32 + [ 33 + jupyter 34 + ipython 35 + ] 36 + ++ (extraPythonPackages ps) 37 + ); 38 + in 21 39 stdenv.mkDerivation (final: { 22 40 pname = "quarto"; 23 41 version = "1.7.30"; ··· 40 58 41 59 preFixup = '' 42 60 wrapProgram $out/bin/quarto \ 43 - --prefix QUARTO_DENO : ${lib.getExe deno} \ 44 - --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \ 45 - --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ 46 - --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ 47 - --prefix QUARTO_TYPST : ${lib.getExe typst} \ 48 - ${ 49 - lib.optionalString (rWrapper != null) 50 - "--prefix QUARTO_R : ${ 51 - rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; } 52 - }/bin/R" 53 - } \ 54 - ${lib.optionalString (python3 != null) 55 - "--prefix QUARTO_PYTHON : ${ 56 - python3.withPackages ( 57 - ps: 58 - with ps; 59 - [ 60 - jupyter 61 - ipython 62 - ] 63 - ++ (extraPythonPackages ps) 64 - ) 65 - }/bin/python3" 66 - } 61 + --set QUARTO_DENO ${lib.getExe deno} \ 62 + --set QUARTO_PANDOC ${lib.getExe pandoc} \ 63 + --set QUARTO_ESBUILD ${lib.getExe esbuild} \ 64 + --set QUARTO_DART_SASS ${lib.getExe dart-sass} \ 65 + --set QUARTO_TYPST ${lib.getExe typst} \ 66 + ${lib.optionalString (rWrapper != null) "--set QUARTO_R ${rWithPackages}/bin/R"} \ 67 + ${lib.optionalString (python3 != null) "--set QUARTO_PYTHON ${pythonWithPackages}/bin/python3"} 67 68 ''; 68 69 69 70 installPhase = ''