From 5d13d05d5e28f38d6798d6524f74990d259d3a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 4 Jun 2026 11:37:52 +0700 Subject: [PATCH] factor: use indent strings for install phase --- .../factor-lang/mk-factor-application.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/factor-lang/mk-factor-application.nix b/pkgs/development/compilers/factor-lang/mk-factor-application.nix index ff3b457a3623..67fb03d130c6 100644 --- a/pkgs/development/compilers/factor-lang/mk-factor-application.nix +++ b/pkgs/development/compilers/factor-lang/mk-factor-application.nix @@ -105,30 +105,26 @@ in __structuredAttrs = true; installPhase = - attrs.installPhase or - /* bash */ '' - runHook preInstall - '' - + (lib.optionalString finalAttrs.enableUI /* bash */ '' + attrs.installPhase or /* bash */ '' + runHook preInstall + ${lib.optionalString finalAttrs.enableUI /* bash */ '' # Set Gdk pixbuf loaders file to the one from the build dependencies here unset GDK_PIXBUF_MODULE_FILE # Defined in gdk-pixbuf setup hook findGdkPixbufLoaders "${librsvg}" appendToVar makeWrapperArgs --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" appendToVar makeWrapperArgs --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib - '') - + (lib.optionalString (wrapped-factor.runtimeLibs != [ ])) /* bash */ '' + ''} + ${lib.optionalString (wrapped-factor.runtimeLibs != [ ]) /* bash */ '' appendToVar makeWrapperArgs --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath wrapped-factor.runtimeLibs}" - '' - + /* bash */ '' - mkdir -p "$out/bin" - makeWrapper "$out/lib/factor/$vocabBaseName/$vocabBaseName" \ - "$out/bin/$binName" \ - --prefix PATH : "${lib.makeBinPath runtimePaths}" \ - "''${makeWrapperArgs[@]}" - runHook postInstall - '' - ); + ''} + mkdir -p "$out/bin" + makeWrapper "$out/lib/factor/$vocabBaseName/$vocabBaseName" \ + "$out/bin/$binName" \ + --prefix PATH : "${lib.makeBinPath runtimePaths}" \ + "''${makeWrapperArgs[@]}" + runHook postInstall + ''; passthru = { vocab = finalAttrs.src;