Skip to content

Commit

Permalink
houdini: make houdini run again
Browse files Browse the repository at this point in the history
After NixOS#363168, houdini can't run anymore becase of infinite loop in
shell script. `extraInstallCommands` of NixOS#363168 gives such script
`$out/bin/houdini`:

```bash
\#!${stdenv.shell}
exec $out/bin/houdini ${unwrapped}/bin/houdini "$@"
```

This script exec itself infinitely.
  • Loading branch information
wrvsrx committed Jan 3, 2025
1 parent 88195a9 commit fe2294a
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions pkgs/by-name/ho/houdini/package.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit fe2294a

Please sign in to comment.