Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

houdini 20.0.506 -> 20.0.688 #311324

Merged
merged 2 commits into from
Jun 2, 2024
Merged

houdini 20.0.506 -> 20.0.688 #311324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a0df56
fix ncurses5 with LD_LIBRARY_PATH hack
pedohorse May 13, 2024
da3bbd9
houdini: 20.0.506 -> 20.0.688
pedohorse May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkgs/applications/misc/houdini/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, writeScript, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
{ lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:

buildFHSEnv rec {
name = "houdini-${unwrapped.version}";
Expand Down Expand Up @@ -30,7 +30,6 @@ buildFHSEnv rec {
bintools # needed for ld and other tools, so ctypes can find/load sos from python
ocl-icd # needed for opencl
numactl # needed by hfs ocl backend
ncurses5 # needed by hfs ocl backend
zstd # needed from 20.0
] ++ (with xorg; [
libICE
Expand Down Expand Up @@ -83,7 +82,7 @@ buildFHSEnv rec {
mkdir -p $out/$(dirname $executable)

echo "#!${stdenv.shell}" >> $out/$executable
echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
echo "exec $WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
done

cd $out
Expand All @@ -96,6 +95,9 @@ buildFHSEnv rec {
];

runScript = writeScript "${name}-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
exec "$@"
'';
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/houdini/runtime.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ lib, stdenv, requireFile, callPackage}:

callPackage ./runtime-build.nix rec {
version = "20.0.506";
version = "20.0.688";
eulaDate = "2021-10-13";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
sha256 = "10dcb695bf9bb6407ccfd91c67858d69864208ee97e1e9afe216abf99db549f5";
sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6";
url = "https://www.sidefx.com/download/daily-builds/?production=true";
};
}