houdini: fix fhsenv version (#363168)

This commit is contained in:
Felix Bühler 2024-12-11 01:54:58 +01:00 committed by GitHub
parent ec329c206b
commit 45344f2de4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,7 +1,7 @@
{ lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
buildFHSEnv rec {
name = "houdini-${unwrapped.version}";
inherit (unwrapped) pname version;
# houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process
dieWithParent = false;
@ -76,7 +76,7 @@ buildFHSEnv rec {
"houdini/sbin/sesinetd"
];
in ''
WRAPPER=$out/bin/${name}
WRAPPER=$out/bin/houdini
EXECUTABLES="${lib.concatStringsSep " " executables}"
for executable in $EXECUTABLES; do
mkdir -p $out/$(dirname $executable)
@ -94,7 +94,7 @@ buildFHSEnv rec {
"--ro-bind-try /etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of not NixOS
];
runScript = writeScript "${name}-wrapper" ''
runScript = writeScript "houdini-wrapper" ''
# ncurses5 is needed by hfs ocl backend
# workaround for this issue: https://github.com/NixOS/nixpkgs/issues/89769
export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH