From 86731c1e55c19c36edad44e1d62e38677eb65a20 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 8 Dec 2024 12:11:40 +0100 Subject: [PATCH] houdini: fix fhsenv version --- pkgs/by-name/ho/houdini/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 4a0a24239a0bd..bfe0ba6e057f5 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -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