From fe2294a1f735e2dd93e8bfcd4af414c6ba857bdb Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 3 Jan 2025 10:46:54 +0800 Subject: [PATCH] houdini: make houdini run again After #363168, houdini can't run anymore becase of infinite loop in shell script. `extraInstallCommands` of #363168 gives such script `$out/bin/houdini`: ```bash \#!${stdenv.shell} exec $out/bin/houdini ${unwrapped}/bin/houdini "$@" ``` This script exec itself infinitely. --- pkgs/by-name/ho/houdini/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index bfe0ba6e057f58..1dc5be5df6dec3 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }: -buildFHSEnv rec { - inherit (unwrapped) pname version; +buildFHSEnv { + pname = "houdini"; + inherit (unwrapped) version; # houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process dieWithParent = false; @@ -76,7 +77,8 @@ buildFHSEnv rec { "houdini/sbin/sesinetd" ]; in '' - WRAPPER=$out/bin/houdini + WRAPPER=$(readlink -f $out/bin/houdini) + rm $out/bin/houdini EXECUTABLES="${lib.concatStringsSep " " executables}" for executable in $EXECUTABLES; do mkdir -p $out/$(dirname $executable)